gentoo resync : 19.07.2019

3 files changed, 121 insertions, 0 deletions

diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index 4563e876251b..a79b5b80d9c2 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -1,7 +1,10 @@
 AUX tcsh-6.18.01-aix.patch 474 BLAKE2B c794769b5ddb354ebbcad902df18db735f06b3e098069e025e5b976b3fdf3758104b48881a94f38f620ba8cb5b307ee3f5a61f528988bd31ff9edd19efb58872 SHA512 ae5dd2f5aee7c14734e775b55f780aa430dd2efc8407b671308215c69e3b97ad37a3b54ad2bc7fabe84b1806997a78ccd15b06ac59491c93dcad14bb14032bd5
 AUX tcsh-6.20.00-debian-dircolors.patch 506 BLAKE2B 584808b9bd488c41a8b375d18b976ef89256771b9282b248c0ac4e500ea5dedb07a05af60c3a5995b511dce49ac95db1b0beb2ae2db11de241e9eea2a72c52cd SHA512 c761857c343c833aea5061baeb54dd86f7a8804424b7ea2009d05fd57b92ba3b892c05fe48a8f4e00a6eee39515086063a9c518004d726626dc5c466958a6dad
 AUX tcsh-6.20.00-use-ncurses-tinfo.patch 382 BLAKE2B 99d794389e3f65607887eae8df4d8af9f9361604f0d70e96a45f3a2b3ec648a6f04f335b2de8fb8b9b6c7441be6009ca38f9f8479ddd9e3e831c4cf0c0b48863 SHA512 d6e2346a0ed093651be7073b04cd31ec1bd587c52fc9a21295405699fed2a63d6ea8415e7c0d29e0f03732288b4a8749e14c9ee85c39a1b4f8e51cfa996166c3
+AUX tcsh-6.21.00-no-nls.patch 386 BLAKE2B 5df1b205d76e29b68530f50b661329e851ce46206306662e150452ffc340e82d2347a0d1407c3a4aed6ee5f1b93257d0dece87b37ebc51f4240ac83a110f471e SHA512 9ece39f524b0d377dd907772c37e9412cb4a700db5d828aa404a0b231b758638cdf1215d026ba574486c2a00b49f20888e7f5683ac4f712845fa484118a8109f
 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-gentoo-patches-r1.9.tar.bz2 2488 BLAKE2B 58924e623c75068cdc686be61755bdbcf8d0949a2141ac532ac089f80ff083b2c9f6767038b9fc52171a00ed82c558b83216327c87b41f51c3648343869cd5b6 SHA512 9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d
 EBUILD tcsh-6.20.00.ebuild 2666 BLAKE2B 39f2c0351674773e9e53b5a3c2b53a92fb7c67ccdf17daffe8c39e67a60256472db7fce023fca677283aea36f92537c0869bcd78c3998eb81e5c1497daf8d970 SHA512 d2a9e1afeb3f376402b4e0963884a6817d2767bdef93a75751868f6470b2a377df4b042b4f22b7994a597bf57ad2a82777434822d0d1782c479f5ad158506811
+EBUILD tcsh-6.21.00.ebuild 2670 BLAKE2B 4d88893031a1f492cd7c39000408691a885d99ec121834940494bffc983dab0b95e36971470ed07775bfd852c41d84803122250a09e7e459ba677f4aee5a1203 SHA512 aaf85f7b7fb21111562557e424266930e2bcf27e517117b4ba6be4aac41e28b3a6d5e23f91c4200061266556848184038d5d8a153d14c82c47c1a8abe646537e
 MISC metadata.xml 645 BLAKE2B 6a9d41c4ca043c899c0bfd8c5140958799c4eaf988f301551e8b8302995c81b0968981a2fda9247189965fc28887841eb30e1f3433262a58c843c0f890f857e5 SHA512 0f36e708c427083603b31df4bd4d808147333ff2711addff30936178e72b10f1020534046cb15ef1fecafee656c37d357ad3b5922320980ee15fddda11912f22
diff --git a/app-shells/tcsh/files/tcsh-6.21.00-no-nls.patch b/app-shells/tcsh/files/tcsh-6.21.00-no-nls.patch
new file mode 100644
index 000000000000..a01ebfb57fdb
--- /dev/null
+++ b/app-shells/tcsh/files/tcsh-6.21.00-no-nls.patch
@@ -0,0 +1,17 @@
+GetCmdChar: fix compilation with --disable-nls
+
+Bug: https://bugs.gentoo.org/689904
+
+--- a/ed.inputl.c
++++ b/ed.inputl.c
+@@ -669,8 +669,8 @@
+ {
+ #ifndef WINNT_NATIVE // We use more than 256 for various extended keys 
+-    wint_t c = ch & CHAR;
++    eChar c = ch & CHAR;
+ #else
+-    wint_t c = ch;
++    eChar c = ch;
+ #endif
+     return c < NT_NUM_KEYS ? CurrentKeyMap[c] : F_INSERT;
+ }
diff --git a/app-shells/tcsh/tcsh-6.21.00.ebuild b/app-shells/tcsh/tcsh-6.21.00.ebuild
new file mode 100644
index 000000000000..c4e52506794f
--- /dev/null
+++ b/app-shells/tcsh/tcsh-6.21.00.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 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="http://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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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
+)
+
+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
+}