Revbump to optionally include multi-line prompt patch by Ben Hoskings as suggested by James Bowlin (bug 205809)

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

4 files changed, 96 insertions, 8 deletions

diff --git a/app-shells/fish/ChangeLog b/app-shells/fish/ChangeLog
index 0ee9c4e2933d..551f8db0ecd0 100644
--- a/app-shells/fish/ChangeLog
+++ b/app-shells/fish/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-shells/fish
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/ChangeLog,v 1.49 2011/07/07 10:41:38 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/ChangeLog,v 1.50 2011/11/12 12:18:03 xmw Exp $
+
+*fish-1.23.1-r2 (12 Nov 2011)
+
+  12 Nov 2011; Michael Weber <xmw@gentoo.org> +fish-1.23.1-r2.ebuild,
+  +files/fish-1.23.1-multi-line_prompts.patch:
+  Revbump to optionally include multi-line prompt patch by Ben Hoskings as
+  suggested by James Bowlin (bug 205809)
 
   07 Jul 2011; Lars Wendler <polynomial-c@gentoo.org> -fish-1.23.0.ebuild,
   fish-1.23.1.ebuild, fish-1.23.1-r1.ebuild:
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index d7618dba5a9a..2496dee89bb0 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -6,17 +6,17 @@ AUX fish-1.23.0-gentoo-alt.patch 1792 RMD160 a550c39db0df1c3b4acdb3cb94cf0123b5e
 AUX fish-1.23.0-glibc-2.8.patch 545 RMD160 eba94b5952a95e4791776f0c873efa0930c3d453 SHA1 cd114eda6d8c9cf89f22c33cc7674260fa93068b SHA256 ea903595943729e82203d745982a00c46cbca45aa0d2ee53e09ca6f5c0bf22be
 AUX fish-1.23.1-fish_indent.patch 783 RMD160 9ce59ca299dc68f9d9d980941e32d0703168b3e1 SHA1 4c73b6d7756d5edde3a7318dc13729df87989279 SHA256 852a0493b8e720b3e40d2e9978268acb235a10618ab8952eec3c6fc60ea85c9a
 AUX fish-1.23.1-gentoo-alt.patch 2507 RMD160 96ee802017f07c8fb5255c0790878b701ed1de73 SHA1 9f9bbaf14043b918aad1e3bcbc36403a8a5de211 SHA256 b3491f7456e33231bf7a8ab3d61996b86c088c0e721fadc56c534d23267e5795
+AUX fish-1.23.1-multi-line_prompts.patch 443 RMD160 74f514cebdccc04f99855515b4beadfe57050d8a SHA1 0dea25393fe4ce7fffaccfeba8e2c00077dd0a5c SHA256 0fe0cbaac4abf393c5ae0c34e963bf696441e8dbb14b6ee4ca4c7b76561ccd09
 DIST fish-1.23.1.tar.bz2 876148 RMD160 820b7a57f31b98a6faf1520b356a06422891e787 SHA1 3a6a5d0cfff348e5f9b1e7cd771865fd1dcd802e SHA256 1ea3d6532226c315993fabd6096ec865fdcde4d43df9e26f9ed020e11e631f93
 EBUILD fish-1.23.1-r1.ebuild 1739 RMD160 daa807ded917ae0aa29f379a68917579c07d6309 SHA1 7c3006eb4de77ea467c6efffd9009f5049cfed75 SHA256 7e535024e167116e7a1cac5a94517e63cc4e5046d388a8ad16853f9be3257aa1
+EBUILD fish-1.23.1-r2.ebuild 1783 RMD160 5891ab2ad1a6af44c40fe72392815ba45013651a SHA1 c86d801f38e24752a05df9f32024c2a36b5f3c02 SHA256 74896b3edd8d3dc73cc3c9a09c4919765ca8191f935224df46126a32b203eb77
 EBUILD fish-1.23.1.ebuild 1642 RMD160 fdbd710883de91177d6228795c78284e18eb18b5 SHA1 f14eecb301db97060d2a260a2d4b301abf29e555 SHA256 bc8fc505264411b5617b5f920e6fefd874a84676bf6fb158b820c616b93f7561
-MISC ChangeLog 9037 RMD160 784c4a8f0c1132417c44856181eea13a035252c6 SHA1 cd75d68eb4d2352acb20bb4e84b69b144f871100 SHA256 d19f80b9fca67382374b7b176b02a098fa1295ca3614202ffa2977c8be10593b
+MISC ChangeLog 9293 RMD160 10d8765fcb7bcc2747ea7e926fb6b267b0abd085 SHA1 67e89d20df53e27794ceed659f62e01d3017cef8 SHA256 f71a2a5e526e5c60958b7440c05ab1445e9a11159a25e6407cc80e9f5ba2dcd9
 MISC metadata.xml 268 RMD160 01696164cd82ae0617304a419940adecf5a9d222 SHA1 b52a9b90dd049bc8749bc0d25cdfddebd447860f SHA256 2089ca59285b2836a6ec1d5aef27f83d580e922212301f0b1eadb04400eb45eb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59AdIACgkQfXuS5UK5QB2kUQP/epciZsGjMKKe4EcBbxR2qyrZ
-8QK6ExVEKv8XtrvM6LW0pg4e6Igi3j/k0WgVLuK4anOnVBhdwJ10v+6vQCJrzfPS
-T7s5ONQ+fIN4IZ+G7FfOwbxcNpzeeWj7PjZy9YwjNG2jsd9Cs8eXIGiNSlmqf3AL
-jom5dwnTwruRGAEH28g=
-=ZWLA
+iF4EAREIAAYFAk6+ZAEACgkQknrdDGLu8JBr7wEAgL5VD2gT2vTQlcoCmaOr6Vae
+eE3ioIbXRTOweW0fDQsA/jus7RTmNaGxVsa7tgAEK/Ycehx8VvlRlcjvoagivlOs
+=nMPq
 -----END PGP SIGNATURE-----
diff --git a/app-shells/fish/files/fish-1.23.1-multi-line_prompts.patch b/app-shells/fish/files/fish-1.23.1-multi-line_prompts.patch
new file mode 100644
index 000000000000..221323d9f638
--- /dev/null
+++ b/app-shells/fish/files/fish-1.23.1-multi-line_prompts.patch
@@ -0,0 +1,15 @@
+Downloaded from http://benhoskin.gs/2009/11/25/multi-line-prompts-in-fish/
+
+--- fish-1.23.1/reader.c
++++ fish-1.23.1/reader.c
+@@ -698,6 +698,10 @@
+ 	for( i=0; i<al_get_count( &prompt_list); i++ )
+ 	{
+ 		sb_append( &data->prompt_buff, (wchar_t *)al_get( &prompt_list, i ) );
++        if (i + 1 < al_get_count( &prompt_list))
++        {
++            sb_append( &data->prompt_buff, L"\n" );
++        }
+ 	}
+ 	
+ 	al_foreach( &prompt_list, &free );
diff --git a/app-shells/fish/fish-1.23.1-r2.ebuild b/app-shells/fish/fish-1.23.1-r2.ebuild
new file mode 100644
index 000000000000..86611821b311
--- /dev/null
+++ b/app-shells/fish/fish-1.23.1-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/fish-1.23.1-r2.ebuild,v 1.1 2011/11/12 12:18:03 xmw Exp $
+
+EAPI="4"
+
+inherit base autotools eutils
+
+DESCRIPTION="fish is the Friendly Interactive SHell"
+HOMEPAGE="http://fishshell.com/"
+SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="X vanilla"
+
+DEPEND="sys-libs/ncurses
+	sys-devel/bc
+	sys-devel/gettext
+	www-client/htmlview
+	X? ( x11-misc/xsel )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.23.0-glibc-2.8.patch"
+	"${FILESDIR}/${PN}-1.22.3-gettext.patch"
+	"${FILESDIR}/${P}-gentoo-alt.patch"
+)
+
+src_prepare() {
+	base_src_prepare
+
+	if ! use vanilla ; then
+		epatch "${FILESDIR}"/${P}-fish_indent.patch
+		epatch "${FILESDIR}"/${P}-multi-line_prompts.patch
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	# Set things up for fish to be a default shell.
+	# It has to be in /bin in case /usr is unavailable.
+	# Also, all of its utilities have to be in /bin.
+	econf \
+		docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--without-xsel \
+		--bindir="${EPREFIX}"/bin
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+}
+
+pkg_postinst() {
+	elog
+	elog "To use ${PN} as your default shell, you need to add ${EPREFIX}/bin/${PN}"
+	elog "to ${EPREFIX}/etc/shells."
+	elog
+	ewarn "Many files moved to ${EROOT}usr/share/fish/completions from ${EROOT}etc/fish.d/."
+	ewarn "Delete everything in ${EROOT}etc/fish.d/ except fish_interactive.fish."
+	ewarn "Otherwise, fish won't notice updates to the installed files,"
+	ewarn "because the ones in /etc will override the new ones in /usr."
+	echo
+}