public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-shells/tcsh/, app-shells/tcsh/files/
@ 2019-07-16  9:38 Fabian Groffen
  0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen @ 2019-07-16  9:38 UTC (permalink / raw
  To: gentoo-commits

commit:     82219cbda3dbd39839cf010fde81fa70aaf6df9e
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 09:38:02 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 09:38:15 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82219cbd

app-shells/tcsh: add patch to fix USE=-nls, bug #689904

Closes: https://bugs.gentoo.org/689904
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 app-shells/tcsh/files/tcsh-6.21.00-no-nls.patch | 17 +++++++++++++++++
 app-shells/tcsh/tcsh-6.21.00.ebuild             |  1 +
 2 files changed, 18 insertions(+)

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 00000000000..a01ebfb57fd
--- /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
index dadd2ea9de5..c4e52506794 100644
--- a/app-shells/tcsh/tcsh-6.21.00.ebuild
+++ b/app-shells/tcsh/tcsh-6.21.00.ebuild
@@ -32,6 +32,7 @@ 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() {


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-shells/tcsh/, app-shells/tcsh/files/
@ 2020-01-26  8:45 Fabian Groffen
  0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen @ 2020-01-26  8:45 UTC (permalink / raw
  To: gentoo-commits

commit:     de0c24161e6a2e4bdf83040268064b0b65df28c4
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 26 08:45:00 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan 26 08:45:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de0c2416

app-shells/tcsh-6.21.00-r1: fix compilation with GCC 10/-fno-common

Closes: https://bugs.gentoo.org/706316
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 .../tcsh/files/tcsh-6.21.00-fno-common.patch       | 22 ++++++++++++++++++++++
 ...{tcsh-6.21.00.ebuild => tcsh-6.21.00-r1.ebuild} |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/app-shells/tcsh/files/tcsh-6.21.00-fno-common.patch b/app-shells/tcsh/files/tcsh-6.21.00-fno-common.patch
new file mode 100644
index 00000000000..b5a0cf0600a
--- /dev/null
+++ b/app-shells/tcsh/files/tcsh-6.21.00-fno-common.patch
@@ -0,0 +1,22 @@
+From 6974bc35a5cda6eab748e364bd76a860ca66968b Mon Sep 17 00:00:00 2001
+From: zoulasc <christos@zoulas.com>
+Date: Sat, 11 Jan 2020 11:16:51 -0500
+Subject: [PATCH] Remove extra variable definition that cause -fno-common build
+ to fail (Werner Fink)
+
+---
+ tc.sig.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/tc.sig.c b/tc.sig.c
+index 77659ca..576605a 100644
+--- a/tc.sig.c
++++ b/tc.sig.c
+@@ -56,7 +56,6 @@ int alrmcatch_disabled; /* = 0; */
+ int phup_disabled; /* = 0; */
+ int pchild_disabled; /* = 0; */
+ int pintr_disabled; /* = 0; */
+-int handle_interrupt; /* = 0; */
+ 
+ int
+ handle_pending_signals(void)

diff --git a/app-shells/tcsh/tcsh-6.21.00.ebuild b/app-shells/tcsh/tcsh-6.21.00-r1.ebuild
similarity index 96%
rename from app-shells/tcsh/tcsh-6.21.00.ebuild
rename to app-shells/tcsh/tcsh-6.21.00-r1.ebuild
index 8085148f47f..8adadc2e6cc 100644
--- a/app-shells/tcsh/tcsh-6.21.00.ebuild
+++ b/app-shells/tcsh/tcsh-6.21.00-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -34,6 +34,7 @@ PATCHES=(
 	"${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() {


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-shells/tcsh/, app-shells/tcsh/files/
@ 2022-02-02  9:18 Fabian Groffen
  0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen @ 2022-02-02  9:18 UTC (permalink / raw
  To: gentoo-commits

commit:     cef87d59020e99f6cd0c62ca6aa113fe98fe30d9
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  2 09:17:40 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Feb  2 09:18:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cef87d59

app-shells/tcsh-6.23.02: version bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 app-shells/tcsh/Manifest                           |   1 +
 app-shells/tcsh/files/tcsh-6.23.02-dircolors.patch |  27 +++++
 app-shells/tcsh/tcsh-6.23.02.ebuild                | 110 +++++++++++++++++++++
 3 files changed, 138 insertions(+)

diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index a8941cee354e..7512bb2c7c91 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -1,3 +1,4 @@
 DIST tcsh-6.22.02.tar.gz 1006405 BLAKE2B f18b2c48958b4d38a0f55b0df8563564b2a3b34becf02eda8802d7f5e2194082bf96c46323d606c2e6bd2a26aaed303bae3132d03515274407c63b713583dde7 SHA512 32d271b568c63265ea4c98494f5e60b37c3a3fc2594e8763b8f6f0b09018ab9db7ef6f951120b37f7880ccf04ba3a2559e30dc08d24f4ba9dc36853238d55980
 DIST tcsh-6.22.04.tar.gz 1012977 BLAKE2B 5702e17e25603a244e4481294cbe2dc2272d4f3ac8362be9e1dd65f3857e0e54520a245d321dda5ef747345776c22068dcb130705daddf71cb650b154ed96ba4 SHA512 3956df52124d496dc0e67e4e3e801787f31690f96a60399953e401648d5b4cfb06baa9833c32cb771177b3e89b7a27e5765534db073206568fe773598a55e873
+DIST tcsh-6.23.02.tar.gz 947265 BLAKE2B f1f6e1b98458a847e55802cdad14cbecb1ed222e18d8fd2547da7765e0658b645685f0baebcf5f08f237a94c7b56ba400d1e51f1743798b8acd375726772825c SHA512 bf83987e4667e3e514b99b6ee0a7f04c8eafad2bdb20f480e2a3614fc2112e01a75d3fcbf43ce54a4ef6d12a03693c3446ae6e14daa91f0ae7556019de1bce2a
 DIST tcsh-gentoo-patches-r1.9.tar.bz2 2488 BLAKE2B 58924e623c75068cdc686be61755bdbcf8d0949a2141ac532ac089f80ff083b2c9f6767038b9fc52171a00ed82c558b83216327c87b41f51c3648343869cd5b6 SHA512 9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d

diff --git a/app-shells/tcsh/files/tcsh-6.23.02-dircolors.patch b/app-shells/tcsh/files/tcsh-6.23.02-dircolors.patch
new file mode 100644
index 000000000000..2fb21476fd29
--- /dev/null
+++ b/app-shells/tcsh/files/tcsh-6.23.02-dircolors.patch
@@ -0,0 +1,27 @@
+Based on original Debian patch, updated from 6.14 to 6.20 and 6.23
+
+silently ignore bad colour variables, for defaults have unsupported ones
+
+https://bugs.gentoo.org/120792
+
+--- a/tw.color.c
++++ b/tw.color.c
+@@ -381,16 +381,14 @@
+ 			if ((Char)variables[i].variable[0] == (v[0] & CHAR) &&
+ 			    (Char)variables[i].variable[1] == (v[1] & CHAR))
+ 			    break;
++		    v += 3;
+ 		    if (i < nvariables) {
+-			v += 3;
+ 			getstring(&c, &v, &variables[i].color, ':');
+ 			if (i == VSym)
+ 			    color_as_referent = strcasecmp(
+ 				variables[VSym].color.s, "target") == 0;
+-			continue;
+ 		    }
+-		    else
+-			stderror(ERR_BADCOLORVAR, v[0], v[1]);
++		    continue;
+ 		}
+ 		break;
+ 	    }

diff --git a/app-shells/tcsh/tcsh-6.23.02.ebuild b/app-shells/tcsh/tcsh-6.23.02.ebuild
new file mode 100644
index 000000000000..272be1706d35
--- /dev/null
+++ b/app-shells/tcsh/tcsh-6.23.02.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit 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 ~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
+	doc? ( dev-lang/perl )"
+
+CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.23.02-dircolors.patch # bug #120792
+	"${FILESDIR}"/${PN}-6.21.04-no-nls.patch
+	"${FILESDIR}"/${PN}-6.21.00-use-ncurses.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# fix gencat usage
+	sed \
+		-e 's/cat \$\^ \$> | \$(GENCAT) \$@/rm -f $@; $(GENCAT) $@ $> $^/' \
+		-i nls/Makefile.in || 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
+	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"'"'"
+
+	# 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' \
+		$(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
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-shells/tcsh/, app-shells/tcsh/files/
@ 2022-07-19  9:21 David Seifert
  0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2022-07-19  9:21 UTC (permalink / raw
  To: gentoo-commits

commit:     2a6576826d120719a01dab06e85652798ab95bbf
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 09:21:36 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 09:21:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a657682

app-shells/tcsh: drop 6.22.02-r1

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 app-shells/tcsh/Manifest                           |   1 -
 app-shells/tcsh/files/tcsh-6.18.01-aix.patch       |  14 ---
 .../tcsh/files/tcsh-6.20.00-debian-dircolors.patch |  21 ----
 .../tcsh/files/tcsh-6.21.00-fno-common.patch       |  22 -----
 app-shells/tcsh/files/tcsh-6.21.00-no-nls.patch    |  17 ----
 app-shells/tcsh/tcsh-6.22.02-r1.ebuild             | 106 ---------------------
 6 files changed, 181 deletions(-)

diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index 553192a208c4..eb3d3a22c667 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -1,4 +1,3 @@
-DIST tcsh-6.22.02.tar.gz 1006405 BLAKE2B f18b2c48958b4d38a0f55b0df8563564b2a3b34becf02eda8802d7f5e2194082bf96c46323d606c2e6bd2a26aaed303bae3132d03515274407c63b713583dde7 SHA512 32d271b568c63265ea4c98494f5e60b37c3a3fc2594e8763b8f6f0b09018ab9db7ef6f951120b37f7880ccf04ba3a2559e30dc08d24f4ba9dc36853238d55980
 DIST tcsh-6.24.00.tar.gz 949411 BLAKE2B 0751707e233fedc2b8a9360f27e8f4a3e030956e97809b0a52ffe0541b6d15b4f7ff2cbd0832743f702757129366a979ecab745342823d9bbb1863c1d024646d SHA512 0a50332aadd4309a8b1506a4771ac77c5368c4e1952dd719bd01eca15711743983ff13ec7098dbaf565b4293ac0355ff565344991e0d0c0c9ef75237220e7730
 DIST tcsh-6.24.01.tar.gz 949438 BLAKE2B 4f3005e98d02aa12cea41405ab7e56cd840ba207d36a657699041b045f537bfbf1c992a20435ee97ea21b4bb25f0d7af532ccd2ef50de8542ca94f914e3f3ca5 SHA512 47425f9bc5ae3df163fe1c9f8a1b1a6c3893b186843d561fb7020c75561587286036cc679212f17fd0f760735d9e01da414e60a69db0ffcb74276f053ea80479
 DIST tcsh-gentoo-patches-r1.9.tar.bz2 2488 BLAKE2B 58924e623c75068cdc686be61755bdbcf8d0949a2141ac532ac089f80ff083b2c9f6767038b9fc52171a00ed82c558b83216327c87b41f51c3648343869cd5b6 SHA512 9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d

diff --git a/app-shells/tcsh/files/tcsh-6.18.01-aix.patch b/app-shells/tcsh/files/tcsh-6.18.01-aix.patch
deleted file mode 100644
index 669d20634731..000000000000
--- a/app-shells/tcsh/files/tcsh-6.18.01-aix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream report, without better patch yet:
-http://bugs.gw.com/view.php?id=366
-
---- tc.who.c.orig	2014-06-26 11:21:43 +0200
-+++ tc.who.c	2014-06-26 11:21:58 +0200
-@@ -60,6 +60,8 @@
- #  define TCSH_PATH_UTMP _PATH_UTMPX
- # elif defined(UTMPX_FILE)
- #  define TCSH_PATH_UTMP UTMPX_FILE
-+# elif defined(UTMP_FILE)
-+#  define TCSH_PATH_UTMP UTMP_FILE
- # elif __FreeBSD_version >= 900000
- #  /* Why isn't this defined somewhere? */
- #  define TCSH_PATH_UTMP "/var/run/utx.active"

diff --git a/app-shells/tcsh/files/tcsh-6.20.00-debian-dircolors.patch b/app-shells/tcsh/files/tcsh-6.20.00-debian-dircolors.patch
deleted file mode 100644
index 3b18f1c45d77..000000000000
--- a/app-shells/tcsh/files/tcsh-6.20.00-debian-dircolors.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-forward-ported 6.14 to 6.20 patch from Debian
-
---- tcsh-6.20.00/tw.color.c
-+++ tcsh-6.20.00/tw.color.c
-@@ -382,13 +382,10 @@
- 			if ((Char)variables[i].variable[0] == (v[0] & CHAR) &&
- 			    (Char)variables[i].variable[1] == (v[1] & CHAR))
- 			    break;
--		    if (i < nvariables) {
--			v += 3;
-+		    v += 3;
-+		    if (i < nvariables)
- 			getstring(&c, &v, &variables[i].color, ':');
--			continue;
--		    }
--		    else
--			stderror(ERR_BADCOLORVAR, v[0], v[1]);
-+		    continue;
- 		}
- 		break;
- 	    }

diff --git a/app-shells/tcsh/files/tcsh-6.21.00-fno-common.patch b/app-shells/tcsh/files/tcsh-6.21.00-fno-common.patch
deleted file mode 100644
index b5a0cf0600a0..000000000000
--- a/app-shells/tcsh/files/tcsh-6.21.00-fno-common.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 6974bc35a5cda6eab748e364bd76a860ca66968b Mon Sep 17 00:00:00 2001
-From: zoulasc <christos@zoulas.com>
-Date: Sat, 11 Jan 2020 11:16:51 -0500
-Subject: [PATCH] Remove extra variable definition that cause -fno-common build
- to fail (Werner Fink)
-
----
- tc.sig.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/tc.sig.c b/tc.sig.c
-index 77659ca..576605a 100644
---- a/tc.sig.c
-+++ b/tc.sig.c
-@@ -56,7 +56,6 @@ int alrmcatch_disabled; /* = 0; */
- int phup_disabled; /* = 0; */
- int pchild_disabled; /* = 0; */
- int pintr_disabled; /* = 0; */
--int handle_interrupt; /* = 0; */
- 
- int
- handle_pending_signals(void)

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
deleted file mode 100644
index a01ebfb57fdb..000000000000
--- a/app-shells/tcsh/files/tcsh-6.21.00-no-nls.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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.22.02-r1.ebuild b/app-shells/tcsh/tcsh-6.22.02-r1.ebuild
deleted file mode 100644
index 5ce918e71b82..000000000000
--- a/app-shells/tcsh/tcsh-6.22.02-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit epatch 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/old/${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 ~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
-	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
-
-	# 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
-	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
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-07-19  9:21 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-26  8:45 [gentoo-commits] repo/gentoo:master commit in: app-shells/tcsh/, app-shells/tcsh/files/ Fabian Groffen
  -- strict thread matches above, loose matches on Subject: below --
2022-07-19  9:21 David Seifert
2022-02-02  9:18 Fabian Groffen
2019-07-16  9:38 Fabian Groffen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox