app-shells/tcsh: Add fix for compilation with ncurses[tinfo], #459484

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

4 files changed, 116 insertions, 24 deletions

diff --git a/app-shells/tcsh/ChangeLog b/app-shells/tcsh/ChangeLog
index cffa9a66aab0..ffbbcc8c0bf5 100644
--- a/app-shells/tcsh/ChangeLog
+++ b/app-shells/tcsh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/tcsh
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.122 2013/05/01 11:12:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.123 2013/05/03 21:54:17 jlec Exp $
+
+*tcsh-6.18.01-r1 (03 May 2013)
+
+  03 May 2013; Justin Lecher <jlec@gentoo.org> +tcsh-6.18.01-r1.ebuild,
+  metadata.xml:
+  Add fix for compilation with ncurses[tinfo], #459484
 
   01 May 2013; Agostino Sarubbo <ago@gentoo.org> tcsh-6.18.01.ebuild:
   Stable for sh, wrt bug #466834
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index 5a8c89c1f554..08cba208dc8c 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -12,23 +12,14 @@ DIST tcsh-gentoo-patches-r1.8.tar.bz2 2484 SHA256 77fa4ae60090ad5a6ec50185eec907
 DIST tcsh-gentoo-patches-r1.9.tar.bz2 2488 SHA256 6375f48d78b64fd97fc2cb07e8117e41459521a8de3919d174eec321a98af483 SHA512 9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d WHIRLPOOL a16e642f32095f5403cad38446acc50e1802e874dba66eccfdc2ab7f5108fe77e91f5990585ba4fffb808be92c15a05f70eaf1fb436da040287b04c207c9a105
 EBUILD tcsh-6.17-r1.ebuild 2672 SHA256 12edb6822d2fe4e60dfd6f6f2a2d3fe6dd436dbb953a52bb5efd3acf53761b63 SHA512 519b50c9d058a17fe3038567b16feee39e449c02bdc0b1caf11edf6c6b5d3cd4f7e901addc9736008a440c6284b2ef7aced900240c1c21c46d906c97a1e7d0b3 WHIRLPOOL 452fc6734c5ee7fee583b03855fd7689b2a5c137f40d6aba0d25c852fd7664bf395b82a9e9450efd18901faf5485fe1e556e55de864b8396994c3611e2459abb
 EBUILD tcsh-6.17.06.ebuild 2625 SHA256 e15163a06c72b6f6376d6fa5e4d439adccb4b7df690931cb093bc30c152327cb SHA512 039f4c1ae1eda8e9d65e2ecd72749ffefb09959a0d593bc240bdd2e2917da26e2a240d7ef9818e79f6ce4fd0b0e496c291f463e01561bce85921ea08f7e2527e WHIRLPOOL c757fa7c8b29177d740c0c9b9a665c17108124eda6c2378911349890817aa2e551ee54b34c593407338965fd00902f359cddbd27c7f897e1b8f27aa0f50b1b79
+EBUILD tcsh-6.18.01-r1.ebuild 2704 SHA256 72033cc2ee7312085917534340879ad45765b3f011f670e0c29677365579ecb7 SHA512 4672d1b2ef6bd469e44245ce272e9254b56f46887a6c054f2f50892b7a1d0fd4eab105a5f023b8c1467e5296da9c837046023c8d2c8c645e42a3595361c902b6 WHIRLPOOL 51681efb6818dc618467eb35d5c1077d3a223b61673cc3129b2f9e07691de0554bdbca5090ad3ede8f1106c5980b84c96435556b64203b973f5c4b4d0247da96
 EBUILD tcsh-6.18.01.ebuild 2622 SHA256 ba3fc555d2dfa5cb260072c3869e993be60ce7aef09aef4b00fbf926dba82f86 SHA512 3c8b26c817336f0ad2d2b0b82e7a601740ea745dfafaca710a09e04f0a370f8e42af04e9c8e4294d1dc8e0a8bc48bde568ecb4d9dae7b65c81978b7d4516aadd WHIRLPOOL 06b92a8502e55f89009a91613598d1a0958318cf1212fa12e67c4ce6f1a811150fe4736d1adc001eaa6a7102edcc48257097ad76fd43eb074385768be80fd3e2
-MISC ChangeLog 17582 SHA256 13209ea07bff63c5ffe918e9362cf59398b78dcc980c88fd2d1601d7c053340d SHA512 4155b1a58b7218820fb1558679cfaabd241b6e822ef8340be366c4c2ae62fb16c8767d167fbc68826f90065489e08baedfa82d165aa85cb76c3cd5b302ec87c4 WHIRLPOOL e8236c7ab1a20479073a4b4804edb26ae2635354411e4d4d2165627b1e6201f19320969485762cd06f677fa2b328ab7686f7ace92832704ef406af675086190a
-MISC metadata.xml 706 SHA256 318990e6f93f738cc70e956b6b00831079b273215eb994da7ec80f03aaa0db59 SHA512 96a1cd8a158d54ac3407252373a656d5935faf95e762abfdcff9f979800bd245578e0eaae043ee4c9f194bec7d9105cc464d5cebe6640baa0db894ba595a3c68 WHIRLPOOL a8f93cdf4fb6f2d07d25ad2eff064dcbb0a442acaa09f6d03f62ec4f8a57adf5248a47d75ebbc4365f0bfb13bfb4d755b341e8d24627a741283e76b968643e1d
+MISC ChangeLog 17759 SHA256 98ffcd26d01986844a6aa996f19707a743187415bc1f5a26946c3ed4793ce11e SHA512 24896b5ee7d11984d50265af668db75538e30063759f776349b79471ca2623f27cf6b4751d8bf66d156dd9b96510b47b9603780e7fe31fa0c97433f2499130cb WHIRLPOOL 22eafd4ea90044f64aa7f479a591880a1aae41a99fc4dbe437cc94502baa81902633d8f1d04f42a172e2c7a3c38120fbd905ccb46089d5ca875f7542fdebc427
+MISC metadata.xml 717 SHA256 9d0cda37351e289f0195b3ddea895e675a0075c244f3fe17ca4add04c1640dc0 SHA512 5ddf72e138e6e44c47656eac2ea0ed176a3590a4089f034462415b30eb2da3a66372f06d66acf7e5ffcdac5cfd4a5d03925c8c476bfcc2c01ded0ae76766e4bd WHIRLPOOL a580ad33dd832a5ca7f33240cef4d685517bcde4738280ca4797e6f9206f822b3dc9e40d490f22bf80f5a715f722d2a786f7aa2f0e1759a6181a7dc378f5ca9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRgPgHAAoJELp701BxlEWfBb4P/il4cL1ThsTQv88gHO5oCTQX
-J6RZLmGZYp0Ab1ZGg4cd/5K/5QaBBV51gJFkBdin/GTqPZ7BlPMNY/VPAnM8wUEk
-0mo8/Inc6z5RZKhkGNkEFLqZDRk/yo1nSBPZln47HSKvNFslSPGYRYLX2HvcgzER
-nFy2PM+4tfH2MO7ypu6Ln7gmKSwdF762FO+55E+YU7Oos/J1ipI6AXmCPiCJtHRh
-nW0GffuwFj6VTKQyjlwQ9zrF1VLeNwB+IPd/LgeypQyC5w9Ii34FVSd/ims/8jUM
-HPDvZM/oRDbKaOdVCU9DM64/NPt72JiZkbgW2bO9K0myt2K6S1NJtFXITtWjm/8E
-4Y2NxXwLDXto/CQzR5ohHbyKGRhv/fKLbyQ0Pb7s5i3paYivTpKwqzL9THKopbgt
-oDxsJ4kB3I5Bvxs4MppT8ZkUzptSoIeQTP+WOpm4/Hg9foFvWpSNyqhvZ4U2jdw3
-euxZVuUXJKcETgmdA1F/MOJ/7KkWGszP6RcKuYI/BPe0w4ddLgdtMGSM6EMr0vJX
-d3nEgsYSoqZURumyM35LGVgdy3fs31MrO+5p2TTWwhlAX73u1OsYMe7R0MvkAoAz
-w3OdXP5hUrvtnKDYlt+RJdLkOyap98rpD1wFSGragSoLAaNaOoLErh4tNcBVO8Wb
-35nwCI9r1YsTSQSiI6Tj
-=swII
+iEYEAREKAAYFAlGEMg4ACgkQgAnW8HDreRap4wCdEoQpP5yMexP7TfBHh21Q/ndj
+EJ8AnilRB5Yg+ax6vSBKWdCauvtV9TPA
+=4aDN
 -----END PGP SIGNATURE-----
diff --git a/app-shells/tcsh/metadata.xml b/app-shells/tcsh/metadata.xml
index 3d2b8a524ea4..bbb6c66303b6 100644
--- a/app-shells/tcsh/metadata.xml
+++ b/app-shells/tcsh/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>grobian@gentoo.org</email>
-		<name>Fabian Groffen</name>
-	</maintainer>
-	<longdescription>
+  <maintainer>
+    <email>grobian@gentoo.org</email>
+    <name>Fabian Groffen</name>
+  </maintainer>
+  <longdescription>
 		Tcsh is an enhanced, but completely compatible version of the Berkeley
 		UNIX C shell (csh). It is a command language interpreter usable both as
 		an interactive login shell and a shell script command processor. It
 		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>
+  <use>
+    <flag name="catalogs">Add support for NLS catalogs</flag>
+  </use>
 </pkgmetadata>
diff --git a/app-shells/tcsh/tcsh-6.18.01-r1.ebuild b/app-shells/tcsh/tcsh-6.18.01-r1.ebuild
new file mode 100644
index 000000000000..f38a2b0a5ed3
--- /dev/null
+++ b/app-shells/tcsh/tcsh-6.18.01-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.18.01-r1.ebuild,v 1.1 2013/05/03 21:54:17 jlec Exp $
+
+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
+	http://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
+
+	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
+
+	# 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) \
+		|| die
+}
+
+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
+}