update delete-word patch for tcsh

5 files changed, 50 insertions, 31 deletions

diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index 4862d06..b20bd6a 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -1,3 +1,3 @@
-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
+DIST tcsh-6.22.02.tar.gz 1006405 SHA256 ed287158ca1b00ba477e8ea57bac53609838ebcfd05fcb05ca95021b7ebe885b SHA512 32d271b568c63265ea4c98494f5e60b37c3a3fc2594e8763b8f6f0b09018ab9db7ef6f951120b37f7880ccf04ba3a2559e30dc08d24f4ba9dc36853238d55980 WHIRLPOOL 82b5b7e8ee69ddf34a8c0a05e09505c3ae147019d1f0e5aba60def140ee19eeac01b9da92a7ac7695b32e1af29ba3812919dac92fb9a0172d9933b9e7f4a2b96
+DIST tcsh-6.22.04.tar.gz 1012977 SHA256 eb16356243218c32f39e07258d72bf8b21e62ce94bb0e8a95e318b151397e231 SHA512 3956df52124d496dc0e67e4e3e801787f31690f96a60399953e401648d5b4cfb06baa9833c32cb771177b3e89b7a27e5765534db073206568fe773598a55e873 WHIRLPOOL 0de156854ed0a5c5313d07678424f1d9df32c519984902537a7e1e8c99368934b6ec44f9e59f5de4a9ec7759f796fa4b98aecbeb9d1677b74a53ff9058f89bcc
+DIST tcsh-gentoo-patches-r1.9.tar.bz2 2488 SHA256 6375f48d78b64fd97fc2cb07e8117e41459521a8de3919d174eec321a98af483 SHA512 9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d WHIRLPOOL a16e642f32095f5403cad38446acc50e1802e874dba66eccfdc2ab7f5108fe77e91f5990585ba4fffb808be92c15a05f70eaf1fb436da040287b04c207c9a105
diff --git a/app-shells/tcsh/files/tcsh-6.20.00-use-ncurses-tinfo.patch b/app-shells/tcsh/files/tcsh-6.20.00-use-ncurses-tinfo.patch
deleted file mode 100644
index e178418..0000000
--- a/app-shells/tcsh/files/tcsh-6.20.00-use-ncurses-tinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tcsh-6.20.00/configure.ac
-+++ tcsh-6.20.00/configure.ac
-@@ -317,7 +317,7 @@
- dnl Checks for libraries
- AC_SEARCH_LIBS(crypt, crypt)
- AC_SEARCH_LIBS(getspnam, sec)
--AC_SEARCH_LIBS([tgetent], [termlib termcap curses ncurses], [], [
-+AC_SEARCH_LIBS([tgetent], [ncurses tinfo], [], [
-    AC_MSG_ERROR([unable to find the tgetent() function])
- ])
- AC_SEARCH_LIBS(gethostbyname, nsl)
diff --git a/app-shells/tcsh/files/tcsh-6.21.04-no-nls.patch b/app-shells/tcsh/files/tcsh-6.21.04-no-nls.patch
new file mode 100644
index 0000000..7f465d8
--- /dev/null
+++ b/app-shells/tcsh/files/tcsh-6.21.04-no-nls.patch
@@ -0,0 +1,18 @@
+GetCmdChar: fix compilation with --disable-nls
+
+Bug: https://bugs.gentoo.org/689904
+
+--- a/ed.inputl.c
++++ b/ed.inputl.c
+@@ -668,9 +668,9 @@
+ GetCmdChar(Char ch)
+ {
+ #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-r1.ebuild b/app-shells/tcsh/tcsh-6.22.02-r7.ebuild
index 59b8936..2efe694 100644
--- a/app-shells/tcsh/tcsh-6.21.00-r1.ebuild
+++ b/app-shells/tcsh/tcsh-6.22.02-r7.ebuild
@@ -1,27 +1,28 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils flag-o-matic autotools prefix
+inherit epatch flag-o-matic autotools prefix
 
 CONFVER="1.9"
 
 DESCRIPTION="Enhanced version of the Berkeley C shell (csh)"
-HOMEPAGE="http://www.tcsh.org/"
+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 ~sh ~sparc ~x86 ~ppc-aix ~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"
 
 # 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
@@ -48,8 +49,10 @@ src_prepare() {
                 -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
+        # 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
diff --git a/app-shells/tcsh/tcsh-6.20.00.ebuild b/app-shells/tcsh/tcsh-6.22.04-r7.ebuild
index 1c2a4f2..211d4b4 100644
--- a/app-shells/tcsh/tcsh-6.20.00.ebuild
+++ b/app-shells/tcsh/tcsh-6.22.04-r7.ebuild
@@ -1,27 +1,28 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils flag-o-matic autotools prefix
+inherit flag-o-matic autotools prefix
 
 CONFVER="1.9"
 
 DESCRIPTION="Enhanced version of the Berkeley C shell (csh)"
-HOMEPAGE="http://www.tcsh.org/"
+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 sh sparc x86 ~ppc-aix ~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"
 
 # 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
@@ -31,13 +32,13 @@ 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
+        "${FILESDIR}"/${PN}-6.21.04-no-nls.patch
+        "${FILESDIR}"/${PN}-6.21.00-use-ncurses.patch
         "${FILESDIR}"/tcsh-lynXified-delete-path.patch
 )
 
 src_prepare() {
-        epatch "${PATCHES[@]}"
+        default
 
         eautoreconf
 
@@ -46,8 +47,10 @@ src_prepare() {
                 -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
+        # 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
@@ -76,6 +79,12 @@ src_configure() {
         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' \
@@ -85,7 +94,7 @@ src_configure() {
 src_install() {
         emake DESTDIR="${D}" install install.man
 
-        DOCS=( FAQ Fixes NewThings Ported README WishList Y2K )
+        DOCS=( FAQ Fixes NewThings Ported README.md WishList Y2K )
         if use doc ; then
                 perl tcsh.man2html tcsh.man || die
                 HTML_DOCS=( tcsh.html/*.html )