1 |
commit: cef87d59020e99f6cd0c62ca6aa113fe98fe30d9 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 2 09:17:40 2022 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 2 09:18:24 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cef87d59 |
7 |
|
8 |
app-shells/tcsh-6.23.02: version bump |
9 |
|
10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
11 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
12 |
|
13 |
app-shells/tcsh/Manifest | 1 + |
14 |
app-shells/tcsh/files/tcsh-6.23.02-dircolors.patch | 27 +++++ |
15 |
app-shells/tcsh/tcsh-6.23.02.ebuild | 110 +++++++++++++++++++++ |
16 |
3 files changed, 138 insertions(+) |
17 |
|
18 |
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest |
19 |
index a8941cee354e..7512bb2c7c91 100644 |
20 |
--- a/app-shells/tcsh/Manifest |
21 |
+++ b/app-shells/tcsh/Manifest |
22 |
@@ -1,3 +1,4 @@ |
23 |
DIST tcsh-6.22.02.tar.gz 1006405 BLAKE2B f18b2c48958b4d38a0f55b0df8563564b2a3b34becf02eda8802d7f5e2194082bf96c46323d606c2e6bd2a26aaed303bae3132d03515274407c63b713583dde7 SHA512 32d271b568c63265ea4c98494f5e60b37c3a3fc2594e8763b8f6f0b09018ab9db7ef6f951120b37f7880ccf04ba3a2559e30dc08d24f4ba9dc36853238d55980 |
24 |
DIST tcsh-6.22.04.tar.gz 1012977 BLAKE2B 5702e17e25603a244e4481294cbe2dc2272d4f3ac8362be9e1dd65f3857e0e54520a245d321dda5ef747345776c22068dcb130705daddf71cb650b154ed96ba4 SHA512 3956df52124d496dc0e67e4e3e801787f31690f96a60399953e401648d5b4cfb06baa9833c32cb771177b3e89b7a27e5765534db073206568fe773598a55e873 |
25 |
+DIST tcsh-6.23.02.tar.gz 947265 BLAKE2B f1f6e1b98458a847e55802cdad14cbecb1ed222e18d8fd2547da7765e0658b645685f0baebcf5f08f237a94c7b56ba400d1e51f1743798b8acd375726772825c SHA512 bf83987e4667e3e514b99b6ee0a7f04c8eafad2bdb20f480e2a3614fc2112e01a75d3fcbf43ce54a4ef6d12a03693c3446ae6e14daa91f0ae7556019de1bce2a |
26 |
DIST tcsh-gentoo-patches-r1.9.tar.bz2 2488 BLAKE2B 58924e623c75068cdc686be61755bdbcf8d0949a2141ac532ac089f80ff083b2c9f6767038b9fc52171a00ed82c558b83216327c87b41f51c3648343869cd5b6 SHA512 9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d |
27 |
|
28 |
diff --git a/app-shells/tcsh/files/tcsh-6.23.02-dircolors.patch b/app-shells/tcsh/files/tcsh-6.23.02-dircolors.patch |
29 |
new file mode 100644 |
30 |
index 000000000000..2fb21476fd29 |
31 |
--- /dev/null |
32 |
+++ b/app-shells/tcsh/files/tcsh-6.23.02-dircolors.patch |
33 |
@@ -0,0 +1,27 @@ |
34 |
+Based on original Debian patch, updated from 6.14 to 6.20 and 6.23 |
35 |
+ |
36 |
+silently ignore bad colour variables, for defaults have unsupported ones |
37 |
+ |
38 |
+https://bugs.gentoo.org/120792 |
39 |
+ |
40 |
+--- a/tw.color.c |
41 |
++++ b/tw.color.c |
42 |
+@@ -381,16 +381,14 @@ |
43 |
+ if ((Char)variables[i].variable[0] == (v[0] & CHAR) && |
44 |
+ (Char)variables[i].variable[1] == (v[1] & CHAR)) |
45 |
+ break; |
46 |
++ v += 3; |
47 |
+ if (i < nvariables) { |
48 |
+- v += 3; |
49 |
+ getstring(&c, &v, &variables[i].color, ':'); |
50 |
+ if (i == VSym) |
51 |
+ color_as_referent = strcasecmp( |
52 |
+ variables[VSym].color.s, "target") == 0; |
53 |
+- continue; |
54 |
+ } |
55 |
+- else |
56 |
+- stderror(ERR_BADCOLORVAR, v[0], v[1]); |
57 |
++ continue; |
58 |
+ } |
59 |
+ break; |
60 |
+ } |
61 |
|
62 |
diff --git a/app-shells/tcsh/tcsh-6.23.02.ebuild b/app-shells/tcsh/tcsh-6.23.02.ebuild |
63 |
new file mode 100644 |
64 |
index 000000000000..272be1706d35 |
65 |
--- /dev/null |
66 |
+++ b/app-shells/tcsh/tcsh-6.23.02.ebuild |
67 |
@@ -0,0 +1,110 @@ |
68 |
+# Copyright 1999-2022 Gentoo Authors |
69 |
+# Distributed under the terms of the GNU General Public License v2 |
70 |
+ |
71 |
+EAPI=7 |
72 |
+ |
73 |
+inherit flag-o-matic autotools prefix |
74 |
+ |
75 |
+CONFVER="1.9" |
76 |
+ |
77 |
+DESCRIPTION="Enhanced version of the Berkeley C shell (csh)" |
78 |
+HOMEPAGE="https://www.tcsh.org/" |
79 |
+SRC_URI=" |
80 |
+ ftp://ftp.astron.com/pub/tcsh/${P}.tar.gz |
81 |
+ https://dev.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2" |
82 |
+ |
83 |
+LICENSE="BSD" |
84 |
+SLOT="0" |
85 |
+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" |
86 |
+IUSE="nls doc" |
87 |
+RESTRICT="test" |
88 |
+ |
89 |
+# we need gettext because we run autoconf (AM_ICONV) |
90 |
+RDEPEND=" |
91 |
+ >=sys-libs/ncurses-5.1:0= |
92 |
+ virtual/libcrypt:= |
93 |
+ virtual/libiconv" |
94 |
+DEPEND="${RDEPEND} |
95 |
+ sys-devel/gettext |
96 |
+ doc? ( dev-lang/perl )" |
97 |
+ |
98 |
+CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER} |
99 |
+ |
100 |
+PATCHES=( |
101 |
+ "${FILESDIR}"/${PN}-6.23.02-dircolors.patch # bug #120792 |
102 |
+ "${FILESDIR}"/${PN}-6.21.04-no-nls.patch |
103 |
+ "${FILESDIR}"/${PN}-6.21.00-use-ncurses.patch |
104 |
+) |
105 |
+ |
106 |
+src_prepare() { |
107 |
+ default |
108 |
+ |
109 |
+ eautoreconf |
110 |
+ |
111 |
+ # fix gencat usage |
112 |
+ sed \ |
113 |
+ -e 's/cat \$\^ \$> | \$(GENCAT) \$@/rm -f $@; $(GENCAT) $@ $> $^/' \ |
114 |
+ -i nls/Makefile.in || die |
115 |
+ |
116 |
+ # always use sysmalloc, the builtin malloc fails on Darwin, musl, |
117 |
+ # etc. it's already used for glibc-linux, so this doesn't change |
118 |
+ # anything for the majority of users |
119 |
+ sed -i -e 's/undef SYSMALLOC/define SYSMALLOC/' config_f.h || die |
120 |
+ |
121 |
+ # unify ECHO behaviour |
122 |
+ echo "#undef ECHO_STYLE" >> config_f.h |
123 |
+ echo "#define ECHO_STYLE BOTH_ECHO" >> config_f.h |
124 |
+ |
125 |
+ eprefixify "${CONFDIR}"/* |
126 |
+ # activate the right default PATH |
127 |
+ if [[ -z ${EPREFIX} ]] ; then |
128 |
+ sed -i \ |
129 |
+ -e 's/^#MAIN//' -e '/^#PREFIX/d' \ |
130 |
+ "${CONFDIR}"/csh.login || die |
131 |
+ else |
132 |
+ sed -i \ |
133 |
+ -e 's/^#PREFIX//' -e '/^#MAIN/d' \ |
134 |
+ "${CONFDIR}"/csh.login || die |
135 |
+ fi |
136 |
+ |
137 |
+ eapply_user |
138 |
+} |
139 |
+ |
140 |
+src_configure() { |
141 |
+ # make tcsh look and live along the lines of the prefix |
142 |
+ append-cppflags -D_PATH_DOTCSHRC="'"'"${EPREFIX}/etc/csh.cshrc"'"'" |
143 |
+ append-cppflags -D_PATH_DOTLOGIN="'"'"${EPREFIX}/etc/csh.login"'"'" |
144 |
+ append-cppflags -D_PATH_DOTLOGOUT="'"'"${EPREFIX}/etc/csh.logout"'"'" |
145 |
+ append-cppflags -D_PATH_USRBIN="'"'"${EPREFIX}/usr/bin"'"'" |
146 |
+ append-cppflags -D_PATH_BIN="'"'"${EPREFIX}/bin"'"'" |
147 |
+ |
148 |
+ # musl's utmp is non-functional |
149 |
+ if use elibc_musl ; then |
150 |
+ export ac_cv_header_utmp_h=no |
151 |
+ export ac_cv_header_utmpx_h=no |
152 |
+ fi |
153 |
+ |
154 |
+ econf \ |
155 |
+ --prefix="${EPREFIX:-}" \ |
156 |
+ --datarootdir='${prefix}/usr/share' \ |
157 |
+ $(use_enable nls) |
158 |
+} |
159 |
+ |
160 |
+src_install() { |
161 |
+ emake DESTDIR="${D}" install install.man |
162 |
+ |
163 |
+ DOCS=( FAQ Fixes NewThings Ported README.md WishList Y2K ) |
164 |
+ if use doc ; then |
165 |
+ perl tcsh.man2html tcsh.man || die |
166 |
+ HTML_DOCS=( tcsh.html/*.html ) |
167 |
+ fi |
168 |
+ einstalldocs |
169 |
+ |
170 |
+ insinto /etc |
171 |
+ doins \ |
172 |
+ "${CONFDIR}"/csh.cshrc \ |
173 |
+ "${CONFDIR}"/csh.login |
174 |
+ |
175 |
+ # bug #119703: add csh -> tcsh symlink |
176 |
+ dosym tcsh /bin/csh |
177 |
+} |