* [gentoo-commits] repo/gentoo:master commit in: app-shells/tcsh/files/, app-shells/tcsh/
@ 2016-12-15 14:07 Fabian Groffen
0 siblings, 0 replies; 5+ messages in thread
From: Fabian Groffen @ 2016-12-15 14:07 UTC (permalink / raw
To: gentoo-commits
commit: 45730222f99dc6e5b3d6f05146b88cd3d955df92
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 15 13:59:07 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 14:07:00 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45730222
app-shells/tcsh: version bump to 6.20
Package-Manager: portage-2.3.0
app-shells/tcsh/Manifest | 2 +-
.../tcsh/files/tcsh-6.20.00-debian-dircolors.patch | 21 +++++
.../files/tcsh-6.20.00-use-ncurses-tinfo.patch | 11 +++
app-shells/tcsh/tcsh-6.17.06.ebuild | 89 ----------------------
...{tcsh-6.18.01-r3.ebuild => tcsh-6.20.00.ebuild} | 42 +++++-----
5 files changed, 55 insertions(+), 110 deletions(-)
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index 32a79a2..36973cd 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -1,5 +1,5 @@
DIST tcsh-6.17.00.tar.gz 890084 SHA256 575266122bc2bc351c84a7f858020c0e6b6f95a64ad4de3ce95e340f57e4a9a9 SHA512 7bb1504ea3aed7d67943c9a642b12982621c79325ef223bfed43c01ea6f9aca44cab7c5c949a7fac910fd5140dac154c2ac125362a7a0bb4c1992ef2fdd76fe3 WHIRLPOOL 2f9350c378b4a6aa757bd7168fb38ababe4e89e842ab43335d43b222af73ff27bdeef558ad9c83d54a5b8a22be18e8be86e4da218fa1fdc91e903476104c94cb
-DIST tcsh-6.17.06.tar.gz 919999 SHA256 c9eff6aa782ecec5c6719954b529fadac97c32f3ba4c56fa07c40d425c2d91df SHA512 77105b6d42ae2924acee5cf9caf759fb713292e89a0a651056e2e89839ee2a3d85286e5b54b570eefce8fdee6742745a12276b448bb891b860a89cc11b42592b WHIRLPOOL 625f718b89ffd53a9f07211c4d1b06c2468ee190afebb032dd519cb3acb57515cdbd5392bc1130885702653561ac3e30e3b562ab10fef37b163b8ae02f089f84
DIST tcsh-6.18.01.tar.gz 926872 SHA256 d81ca27851f3e8545666399b4bcf25433e602a195113b3f7c73886fef84c9fa8 SHA512 2791709f6db19b70652259f7dd5ee5c5d7943e814b3904cac5a3e890ff3b144401ed8552bd4f82ec789378d85c3f785438446c4d97d229c46bd0a08970d34628 WHIRLPOOL 3a77a207fb53e81ccedec821dc20c55cdd60f0ea290b3042e0858dc479a9a208d515c065521118e85dba839f0ff765b435c42118849d5159e12cab52fdbfc001
+DIST tcsh-6.20.00.tar.gz 1001696 SHA256 b89de7064ab54dac454a266cfe5d8bf66940cb5ed048d0c30674ea62e7ecef9d SHA512 c5635393c22341e62fb9a0b953ddf8871a876ab09deb08c98237f93afa9257b4a3381d1db65eefe769e22ef845db29ab7bc78773f1f609d73c8205689a6683e9 WHIRLPOOL 09090ca8f698b4cc85b9a6dede56cf83a1f71b9844ac99729d0472bb9f7c4593572673b07f0ec9a0eb34cf7903cad08c20d93c795aff66f0717a48b47efa86b0
DIST tcsh-gentoo-patches-r1.8.tar.bz2 2484 SHA256 77fa4ae60090ad5a6ec50185eec9070757eedb798b1c29327d27fc582cb59f37 SHA512 ab7bf0beb7fcb6fd0d5f18089f6e86ee62b5cc780a1b34cee576199eaac3b08ee84740b53327a37440b58042246a12da253c698655367fde548e121f4e3101b2 WHIRLPOOL 8ec43dd26dcedb6ef12a552c8029a88e9cc7569ba069c90567d75ddd103fe08edaabd8c57418484435bb782410f9b58886e189f347cb50249280aa7fb88afb4f
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-debian-dircolors.patch b/app-shells/tcsh/files/tcsh-6.20.00-debian-dircolors.patch
new file mode 100644
index 00000000..3b18f1c
--- /dev/null
+++ b/app-shells/tcsh/files/tcsh-6.20.00-debian-dircolors.patch
@@ -0,0 +1,21 @@
+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.20.00-use-ncurses-tinfo.patch b/app-shells/tcsh/files/tcsh-6.20.00-use-ncurses-tinfo.patch
new file mode 100644
index 00000000..e178418
--- /dev/null
+++ b/app-shells/tcsh/files/tcsh-6.20.00-use-ncurses-tinfo.patch
@@ -0,0 +1,11 @@
+--- 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/tcsh-6.17.06.ebuild b/app-shells/tcsh/tcsh-6.17.06.ebuild
deleted file mode 100644
index 5b8a98d..00000000
--- a/app-shells/tcsh/tcsh-6.17.06.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-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/beta/${P}.tar.gz
- https://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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
- virtual/libiconv"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- doc? ( dev-lang/perl )"
-
-CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-6.14.00-debian-dircolors.patch # bug #120792
- epatch "${FILESDIR}"/${PN}-6.14-makefile.patch # bug #151951
- epatch "${FILESDIR}"/${PN}-6.14-use-ncurses.patch
- eautoreconf
-
- # fix gencat usage
- sed -i -e 's/cat \$\^ \$> | \$(GENCAT) \$@/rm -f $@; $(GENCAT) $@ $> $^/' \
- nls/Makefile.in || 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
-}
-
-src_configure() {
- # make tcsh look and live along the lines of the prefix
- append-flags -D_PATH_DOTCSHRC="'"'"${EPREFIX}/etc/csh.cshrc"'"'"
- append-flags -D_PATH_DOTLOGIN="'"'"${EPREFIX}/etc/csh.login"'"'"
- append-flags -D_PATH_DOTLOGOUT="'"'"${EPREFIX}/etc/csh.logout"'"'"
- append-flags -D_PATH_USRBIN="'"'"${EPREFIX}/usr/bin"'"'"
- append-flags -D_PATH_BIN="'"'"${EPREFIX}/bin"'"'"
-
- econf \
- --prefix="${EPREFIX:-/}" \
- --datarootdir='${prefix}/usr/share' \
- $(use_enable nls)
-}
-
-src_install() {
- emake DESTDIR="${D}" install install.man || die
-
- if use doc ; then
- perl tcsh.man2html tcsh.man || die
- dohtml tcsh.html/*.html
- fi
-
- insinto /etc
- doins \
- "${CONFDIR}"/csh.cshrc \
- "${CONFDIR}"/csh.login
-
- dodoc FAQ Fixes NewThings Ported README WishList Y2K
-
- # bug #119703: add csh -> tcsh symlink
- dosym /bin/tcsh /bin/csh
-}
diff --git a/app-shells/tcsh/tcsh-6.18.01-r3.ebuild b/app-shells/tcsh/tcsh-6.20.00.ebuild
similarity index 73%
rename from app-shells/tcsh/tcsh-6.18.01-r3.ebuild
rename to app-shells/tcsh/tcsh-6.20.00.ebuild
index 785e317..e388f4b 100644
--- a/app-shells/tcsh/tcsh-6.18.01-r3.ebuild
+++ b/app-shells/tcsh/tcsh-6.20.00.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="3"
+EAPI=6
inherit eutils flag-o-matic autotools prefix
@@ -10,7 +10,8 @@ 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
+SRC_URI="
+ ftp://ftp.astron.com/pub/tcsh/${P}.tar.gz
https://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2"
LICENSE="BSD"
@@ -20,7 +21,8 @@ IUSE="nls doc"
RESTRICT="test"
# we need gettext because we run autoconf (AM_ICONV)
-RDEPEND=">=sys-libs/ncurses-5.1
+RDEPEND="
+ >=sys-libs/ncurses-5.1:0=
virtual/libiconv"
DEPEND="${RDEPEND}
sys-devel/gettext
@@ -28,23 +30,21 @@ DEPEND="${RDEPEND}
CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER}
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-6.14.00-debian-dircolors.patch # bug #120792
- epatch "${FILESDIR}"/${PN}-6.14-makefile.patch # bug #151951
- epatch "${FILESDIR}"/${PN}-6.14-use-ncurses.patch
- epatch "${FILESDIR}"/${PN}-6.18.01-aix.patch
- epatch "${FILESDIR}"/${PN}-6.18.01-gcc5.patch
+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
+)
- # fix dependency on ncurses[tinfo], #459484
- sed \
- -e "s:\(ncurses\):\1 tinfo:g" \
- -i configure.in || die
+src_prepare() {
+ epatch "${PATCHES[@]}"
eautoreconf
# fix gencat usage
- sed -i -e 's/cat \$\^ \$> | \$(GENCAT) \$@/rm -f $@; $(GENCAT) $@ $> $^/' \
- nls/Makefile.in || die
+ 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
@@ -64,6 +64,8 @@ src_prepare() {
-e 's/^#PREFIX//' -e '/^#MAIN/d' \
"${CONFDIR}"/csh.login || die
fi
+
+ eapply_user
}
src_configure() {
@@ -81,20 +83,20 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${D}" install install.man || die
+ emake DESTDIR="${D}" install install.man
+ DOCS=( FAQ Fixes NewThings Ported README WishList Y2K )
if use doc ; then
perl tcsh.man2html tcsh.man || die
- dohtml tcsh.html/*.html
+ HTML_DOCS=( tcsh.html/*.html )
fi
+ einstalldocs
insinto /etc
doins \
"${CONFDIR}"/csh.cshrc \
"${CONFDIR}"/csh.login
- dodoc FAQ Fixes NewThings Ported README WishList Y2K
-
# bug #119703: add csh -> tcsh symlink
dosym /bin/tcsh /bin/csh
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/tcsh/files/, app-shells/tcsh/
@ 2017-02-21 7:31 Fabian Groffen
0 siblings, 0 replies; 5+ messages in thread
From: Fabian Groffen @ 2017-02-21 7:31 UTC (permalink / raw
To: gentoo-commits
commit: 1c4359204f469941faaedf177d43a5cb1f15f82b
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 21 07:31:17 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Feb 21 07:31:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c435920
app-shells/tcsh: cleanup
Package-Manager: portage-2.3.3
app-shells/tcsh/files/tcsh-6.18.01-gcc5.patch | 31 --------
app-shells/tcsh/tcsh-6.17-r1.ebuild | 2 +-
app-shells/tcsh/tcsh-6.18.01-r2.ebuild | 99 ------------------------
app-shells/tcsh/tcsh-6.18.01-r4.ebuild | 107 --------------------------
app-shells/tcsh/tcsh-6.18.01.ebuild | 2 +-
5 files changed, 2 insertions(+), 239 deletions(-)
diff --git a/app-shells/tcsh/files/tcsh-6.18.01-gcc5.patch b/app-shells/tcsh/files/tcsh-6.18.01-gcc5.patch
deleted file mode 100644
index d9501572fe..0000000000
--- a/app-shells/tcsh/files/tcsh-6.18.01-gcc5.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://bugs.gentoo.org/545176
-http://mx.gw.com/pipermail/tcsh-bugs/2015-May/000945.html
-https://github.com/tcsh-org/tcsh/commit/624d3aebb6e6afadb4f35e894d11b5ebe290cd87
-
-From 624d3aebb6e6afadb4f35e894d11b5ebe290cd87 Mon Sep 17 00:00:00 2001
-From: christos <christos>
-Date: Thu, 28 May 2015 11:47:03 +0000
-Subject: [PATCH] avoid gcc-5 optimization malloc + memset = calloc (Fridolin
- Pokorny)
-
----
- tc.alloc.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- a/tc.alloc.c
-+++ b/tc.alloc.c
-@@ -348,10 +348,13 @@ calloc(size_t i, size_t j)
- {
- #ifndef lint
- char *cp;
-+ volatile size_t k;
-
- i *= j;
- cp = xmalloc(i);
-- memset(cp, 0, i);
-+ /* Stop gcc 5.x from optimizing malloc+memset = calloc */
-+ k = i;
-+ memset(cp, 0, k);
-
- return ((memalign_t) cp);
- #else
diff --git a/app-shells/tcsh/tcsh-6.17-r1.ebuild b/app-shells/tcsh/tcsh-6.17-r1.ebuild
index daf15e8541..293e36473d 100644
--- a/app-shells/tcsh/tcsh-6.17-r1.ebuild
+++ b/app-shells/tcsh/tcsh-6.17-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.astron.com/pub/tcsh/old/${MY_P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="m68k"
IUSE="catalogs doc"
RESTRICT="test"
diff --git a/app-shells/tcsh/tcsh-6.18.01-r2.ebuild b/app-shells/tcsh/tcsh-6.18.01-r2.ebuild
deleted file mode 100644
index a771a8a06a..0000000000
--- a/app-shells/tcsh/tcsh-6.18.01-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-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://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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
- virtual/libiconv"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- doc? ( dev-lang/perl )"
-
-CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-6.14.00-debian-dircolors.patch # bug #120792
- epatch "${FILESDIR}"/${PN}-6.14-makefile.patch # bug #151951
- epatch "${FILESDIR}"/${PN}-6.14-use-ncurses.patch
- epatch "${FILESDIR}"/${PN}-6.18.01-aix.patch
-
- # fix dependency on ncurses[tinfo], #459484
- sed \
- -e "s:\(ncurses\):\1 tinfo:g" \
- -i configure.in || die
-
- eautoreconf
-
- # fix gencat usage
- sed -i -e 's/cat \$\^ \$> | \$(GENCAT) \$@/rm -f $@; $(GENCAT) $@ $> $^/' \
- 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
-}
-
-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 || die
-
- if use doc ; then
- perl tcsh.man2html tcsh.man || die
- dohtml tcsh.html/*.html
- fi
-
- insinto /etc
- doins \
- "${CONFDIR}"/csh.cshrc \
- "${CONFDIR}"/csh.login
-
- dodoc FAQ Fixes NewThings Ported README WishList Y2K
-
- # bug #119703: add csh -> tcsh symlink
- dosym /bin/tcsh /bin/csh
-}
diff --git a/app-shells/tcsh/tcsh-6.18.01-r4.ebuild b/app-shells/tcsh/tcsh-6.18.01-r4.ebuild
deleted file mode 100644
index ce871385a3..0000000000
--- a/app-shells/tcsh/tcsh-6.18.01-r4.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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.14.00-debian-dircolors.patch # bug #120792
- "${FILESDIR}"/${PN}-6.14-makefile.patch # bug #151951
- "${FILESDIR}"/${PN}-6.14-use-ncurses.patch
- "${FILESDIR}"/${PN}-6.18.01-aix.patch
- "${FILESDIR}"/${PN}-6.18.01-gcc5.patch
-)
-
-src_prepare() {
- epatch "${PATCHES[@]}"
-
- # fix dependency on ncurses[tinfo], #459484
- sed \
- -e "s:\(ncurses\):\1 tinfo:g" \
- -i configure.in || die
-
- 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
-}
-
-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 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 /bin/tcsh /bin/csh
-}
diff --git a/app-shells/tcsh/tcsh-6.18.01.ebuild b/app-shells/tcsh/tcsh-6.18.01.ebuild
index 8ba222e54c..c4ad219f4c 100644
--- a/app-shells/tcsh/tcsh-6.18.01.ebuild
+++ b/app-shells/tcsh/tcsh-6.18.01.ebuild
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.astron.com/pub/tcsh/${P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="s390 sh"
IUSE="nls doc"
RESTRICT="test"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/tcsh/files/, app-shells/tcsh/
@ 2017-04-10 11:13 Andreas Hüttel
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Hüttel @ 2017-04-10 11:13 UTC (permalink / raw
To: gentoo-commits
commit: 7f8e75ec7f6b0b65bf8aa65a2e9d3f8a0f6e4b41
Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 10 10:58:38 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 10:58:38 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f8e75ec
app-shells/tcsh: Remove old, bug 605728
Package-Manager: Portage-2.3.5, Repoman-2.3.2
app-shells/tcsh/Manifest | 3 -
app-shells/tcsh/files/tcsh-6.14-makefile.patch | 16 ----
app-shells/tcsh/files/tcsh-6.14-use-ncurses.patch | 11 ---
.../tcsh/files/tcsh-6.14.00-debian-dircolors.patch | 19 -----
app-shells/tcsh/metadata.xml | 3 -
app-shells/tcsh/tcsh-6.17-r1.ebuild | 92 ----------------------
app-shells/tcsh/tcsh-6.18.01.ebuild | 88 ---------------------
7 files changed, 232 deletions(-)
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index 36973cd6581..7e72ccc3d39 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -1,5 +1,2 @@
-DIST tcsh-6.17.00.tar.gz 890084 SHA256 575266122bc2bc351c84a7f858020c0e6b6f95a64ad4de3ce95e340f57e4a9a9 SHA512 7bb1504ea3aed7d67943c9a642b12982621c79325ef223bfed43c01ea6f9aca44cab7c5c949a7fac910fd5140dac154c2ac125362a7a0bb4c1992ef2fdd76fe3 WHIRLPOOL 2f9350c378b4a6aa757bd7168fb38ababe4e89e842ab43335d43b222af73ff27bdeef558ad9c83d54a5b8a22be18e8be86e4da218fa1fdc91e903476104c94cb
-DIST tcsh-6.18.01.tar.gz 926872 SHA256 d81ca27851f3e8545666399b4bcf25433e602a195113b3f7c73886fef84c9fa8 SHA512 2791709f6db19b70652259f7dd5ee5c5d7943e814b3904cac5a3e890ff3b144401ed8552bd4f82ec789378d85c3f785438446c4d97d229c46bd0a08970d34628 WHIRLPOOL 3a77a207fb53e81ccedec821dc20c55cdd60f0ea290b3042e0858dc479a9a208d515c065521118e85dba839f0ff765b435c42118849d5159e12cab52fdbfc001
DIST tcsh-6.20.00.tar.gz 1001696 SHA256 b89de7064ab54dac454a266cfe5d8bf66940cb5ed048d0c30674ea62e7ecef9d SHA512 c5635393c22341e62fb9a0b953ddf8871a876ab09deb08c98237f93afa9257b4a3381d1db65eefe769e22ef845db29ab7bc78773f1f609d73c8205689a6683e9 WHIRLPOOL 09090ca8f698b4cc85b9a6dede56cf83a1f71b9844ac99729d0472bb9f7c4593572673b07f0ec9a0eb34cf7903cad08c20d93c795aff66f0717a48b47efa86b0
-DIST tcsh-gentoo-patches-r1.8.tar.bz2 2484 SHA256 77fa4ae60090ad5a6ec50185eec9070757eedb798b1c29327d27fc582cb59f37 SHA512 ab7bf0beb7fcb6fd0d5f18089f6e86ee62b5cc780a1b34cee576199eaac3b08ee84740b53327a37440b58042246a12da253c698655367fde548e121f4e3101b2 WHIRLPOOL 8ec43dd26dcedb6ef12a552c8029a88e9cc7569ba069c90567d75ddd103fe08edaabd8c57418484435bb782410f9b58886e189f347cb50249280aa7fb88afb4f
DIST tcsh-gentoo-patches-r1.9.tar.bz2 2488 SHA256 6375f48d78b64fd97fc2cb07e8117e41459521a8de3919d174eec321a98af483 SHA512 9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d WHIRLPOOL a16e642f32095f5403cad38446acc50e1802e874dba66eccfdc2ab7f5108fe77e91f5990585ba4fffb808be92c15a05f70eaf1fb436da040287b04c207c9a105
diff --git a/app-shells/tcsh/files/tcsh-6.14-makefile.patch b/app-shells/tcsh/files/tcsh-6.14-makefile.patch
deleted file mode 100644
index 6d85aa0588f..00000000000
--- a/app-shells/tcsh/files/tcsh-6.14-makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-* don't strip (portage does that for us)
-* don't try to move away an older tcsh binary; we don't install in / so
- that only results in an ugly error message
-
---- tcsh-6.14.00/Makefile.in
-+++ tcsh-6.14.00/Makefile.in
-@@ -477,9 +477,7 @@
-
- install: tcsh$(EXEEXT)
- -mkdir -p ${DESTBIN}
-- -mv -f ${DESTBIN}/tcsh$(EXEEXT) ${DESTBIN}/tcsh.old
- cp tcsh$(EXEEXT) ${DESTBIN}/tcsh$(EXEEXT)
-- -strip ${DESTBIN}/tcsh$(EXEEXT)
- chmod 755 ${DESTBIN}/tcsh$(EXEEXT)
-
- install.man: tcsh.man
diff --git a/app-shells/tcsh/files/tcsh-6.14-use-ncurses.patch b/app-shells/tcsh/files/tcsh-6.14-use-ncurses.patch
deleted file mode 100644
index 8fc902c19b4..00000000000
--- a/app-shells/tcsh/files/tcsh-6.14-use-ncurses.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in
-+++ configure.in
-@@ -257,7 +257,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)
- AC_SEARCH_LIBS(gethostbyname, nsl)
- AC_SEARCH_LIBS(connect, socket)
- AC_SEARCH_LIBS([iconv], [iconv], [AC_DEFINE([HAVE_ICONV], [1],
diff --git a/app-shells/tcsh/files/tcsh-6.14.00-debian-dircolors.patch b/app-shells/tcsh/files/tcsh-6.14.00-debian-dircolors.patch
deleted file mode 100644
index 194d478c403..00000000000
--- a/app-shells/tcsh/files/tcsh-6.14.00-debian-dircolors.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- tcsh-6.14.00/tw.color.c
-+++ tcsh-6.14.00/tw.color.c
-@@ -235,13 +235,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/metadata.xml b/app-shells/tcsh/metadata.xml
index 19fc17dab30..b99b69c44e6 100644
--- a/app-shells/tcsh/metadata.xml
+++ b/app-shells/tcsh/metadata.xml
@@ -12,7 +12,4 @@
includes a command-line editor, programmable word completion, spelling
correction, a history mechanism, job control and a C-like syntax.
</longdescription>
- <use>
- <flag name="catalogs">Add support for NLS catalogs</flag>
- </use>
</pkgmetadata>
diff --git a/app-shells/tcsh/tcsh-6.17-r1.ebuild b/app-shells/tcsh/tcsh-6.17-r1.ebuild
deleted file mode 100644
index a399e9f3334..00000000000
--- a/app-shells/tcsh/tcsh-6.17-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit eutils flag-o-matic autotools prefix
-
-CONFVER="1.8"
-
-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/old/${MY_P}.tar.gz
- https://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="m68k"
-IUSE="catalogs doc"
-RESTRICT="test"
-
-# we need gettext because we run autoconf (AM_ICONV)
-RDEPEND=">=sys-libs/ncurses-5.1
- virtual/libiconv"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- doc? ( dev-lang/perl )"
-
-S=${WORKDIR}/${MY_P}
-CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER}
-
-src_prepare() {
- epatch "${FILESDIR}/${MY_P/17/14}"-debian-dircolors.patch # bug #120792
- epatch "${FILESDIR}"/${PN}-6.14-makefile.patch # bug #151951
- epatch "${FILESDIR}"/${PN}-6.14-use-ncurses.patch
- eautoreconf
-
- if use catalogs ; then
- einfo "enabling NLS catalogs support..."
- sed -i -e "s/#undef NLS_CATALOGS/#define NLS_CATALOGS/" \
- config_f.h || die
- eend $?
- fi
-
- # 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
-}
-
-src_configure() {
- # make tcsh look and live along the lines of the prefix
- append-flags -D_PATH_DOTCSHRC="'"'"${EPREFIX}/etc/csh.cshrc"'"'"
- append-flags -D_PATH_DOTLOGIN="'"'"${EPREFIX}/etc/csh.login"'"'"
- append-flags -D_PATH_DOTLOGOUT="'"'"${EPREFIX}/etc/csh.logout"'"'"
- append-flags -D_PATH_USRBIN="'"'"${EPREFIX}/usr/bin"'"'"
- append-flags -D_PATH_BIN="'"'"${EPREFIX}/bin"'"'"
-
- econf \
- --prefix="${EPREFIX:-/}" \
- --datarootdir='${prefix}/usr/share'
-}
-
-src_install() {
- emake DESTDIR="${D}" install install.man || die
-
- if use doc ; then
- perl tcsh.man2html tcsh.man || die
- dohtml tcsh.html/*.html
- fi
-
- insinto /etc
- doins \
- "${CONFDIR}"/csh.cshrc \
- "${CONFDIR}"/csh.login
-
- dodoc FAQ Fixes NewThings Ported README WishList Y2K
-
- # bug #119703: add csh -> tcsh symlink
- dosym /bin/tcsh /bin/csh
-}
diff --git a/app-shells/tcsh/tcsh-6.18.01.ebuild b/app-shells/tcsh/tcsh-6.18.01.ebuild
deleted file mode 100644
index c45d8eb3f9d..00000000000
--- a/app-shells/tcsh/tcsh-6.18.01.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-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://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="s390 sh"
-IUSE="nls doc"
-RESTRICT="test"
-
-# we need gettext because we run autoconf (AM_ICONV)
-RDEPEND=">=sys-libs/ncurses-5.1
- virtual/libiconv"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- doc? ( dev-lang/perl )"
-
-CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-6.14.00-debian-dircolors.patch # bug #120792
- epatch "${FILESDIR}"/${PN}-6.14-makefile.patch # bug #151951
- epatch "${FILESDIR}"/${PN}-6.14-use-ncurses.patch
- eautoreconf
-
- # fix gencat usage
- sed -i -e 's/cat \$\^ \$> | \$(GENCAT) \$@/rm -f $@; $(GENCAT) $@ $> $^/' \
- nls/Makefile.in || 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
-}
-
-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 || die
-
- if use doc ; then
- perl tcsh.man2html tcsh.man || die
- dohtml tcsh.html/*.html
- fi
-
- insinto /etc
- doins \
- "${CONFDIR}"/csh.cshrc \
- "${CONFDIR}"/csh.login
-
- dodoc FAQ Fixes NewThings Ported README WishList Y2K
-
- # bug #119703: add csh -> tcsh symlink
- dosym /bin/tcsh /bin/csh
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/tcsh/files/, app-shells/tcsh/
@ 2019-07-21 12:46 Fabian Groffen
0 siblings, 0 replies; 5+ messages in thread
From: Fabian Groffen @ 2019-07-21 12:46 UTC (permalink / raw
To: gentoo-commits
commit: 1c95732b0f076590596bb71dce1d5f79b102d6a1
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 21 12:40:45 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 12:40:59 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c95732b
app-shells/tcsh: fix linking on some Prefix platforms
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-use-ncurses.patch | 11 +++++++++++
app-shells/tcsh/tcsh-6.21.00.ebuild | 1 +
2 files changed, 12 insertions(+)
diff --git a/app-shells/tcsh/files/tcsh-6.21.00-use-ncurses.patch b/app-shells/tcsh/files/tcsh-6.21.00-use-ncurses.patch
new file mode 100644
index 00000000000..d268474d978
--- /dev/null
+++ b/app-shells/tcsh/files/tcsh-6.21.00-use-ncurses.patch
@@ -0,0 +1,11 @@
+--- tcsh-6.21.00/configure.ac
++++ tcsh-6.21.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 tinfo termcap curses ncurses], [], [
++AC_SEARCH_LIBS([tgetent], [tinfo ncurses], [], [
+ AC_MSG_ERROR([unable to find the tgetent() function])
+ ])
+ AC_SEARCH_LIBS(gethostbyname, nsl)
diff --git a/app-shells/tcsh/tcsh-6.21.00.ebuild b/app-shells/tcsh/tcsh-6.21.00.ebuild
index c4e52506794..3dc6aa72e6b 100644
--- a/app-shells/tcsh/tcsh-6.21.00.ebuild
+++ b/app-shells/tcsh/tcsh-6.21.00.ebuild
@@ -33,6 +33,7 @@ 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
)
src_prepare() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/tcsh/files/, app-shells/tcsh/
@ 2021-05-18 11:35 Fabian Groffen
0 siblings, 0 replies; 5+ messages in thread
From: Fabian Groffen @ 2021-05-18 11:35 UTC (permalink / raw
To: gentoo-commits
commit: 0cbe880a5806bcf88d459f0527b1517081d4db98
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue May 18 11:34:44 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue May 18 11:35:10 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cbe880a
app-shells/tcsh-6.2104: version bump
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
app-shells/tcsh/Manifest | 1 +
app-shells/tcsh/files/tcsh-6.21.04-no-nls.patch | 18 +++++
app-shells/tcsh/tcsh-6.22.04.ebuild | 103 ++++++++++++++++++++++++
3 files changed, 122 insertions(+)
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index e7de9ecf0e8..a8941cee354 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -1,2 +1,3 @@
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-gentoo-patches-r1.9.tar.bz2 2488 BLAKE2B 58924e623c75068cdc686be61755bdbcf8d0949a2141ac532ac089f80ff083b2c9f6767038b9fc52171a00ed82c558b83216327c87b41f51c3648343869cd5b6 SHA512 9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d
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 00000000000..7f465d8a75e
--- /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.22.04.ebuild b/app-shells/tcsh/tcsh-6.22.04.ebuild
new file mode 100644
index 00000000000..3ce4f1d44b2
--- /dev/null
+++ b/app-shells/tcsh/tcsh-6.22.04.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 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/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.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"'"'"
+
+ 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] 5+ messages in thread
end of thread, other threads:[~2021-05-18 11:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-10 11:13 [gentoo-commits] repo/gentoo:master commit in: app-shells/tcsh/files/, app-shells/tcsh/ Andreas Hüttel
-- strict thread matches above, loose matches on Subject: below --
2021-05-18 11:35 Fabian Groffen
2019-07-21 12:46 Fabian Groffen
2017-02-21 7:31 Fabian Groffen
2016-12-15 14:07 Fabian Groffen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox