app-shells/tcsh: version bump to 6.20

Package-Manager: portage-2.3.0

5 files changed, 55 insertions, 110 deletions

diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index 32a79a26cd2..36973cd6581 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 00000000000..3b18f1c45d7
--- /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 00000000000..e17841863d8
--- /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 5b8a98d0de3..00000000000
--- 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
index 785e3170858..e388f4bce8e 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
 }