Revbump to optionally include identation patch

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

4 files changed, 109 insertions, 12 deletions

diff --git a/app-shells/fish/ChangeLog b/app-shells/fish/ChangeLog
index 6e26d31770ac..6512c63a9bad 100644
--- a/app-shells/fish/ChangeLog
+++ b/app-shells/fish/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-shells/fish
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/ChangeLog,v 1.47 2010/06/21 17:19:29 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/ChangeLog,v 1.48 2010/11/27 23:28:06 xmw Exp $
+
+*fish-1.23.1-r1 (27 Nov 2010)
+
+  27 Nov 2010; Michael Weber <xmw@gentoo.org> +fish-1.23.1-r1.ebuild,
+  +files/fish-1.23.1-fish_indent.patch:
+  Revbump to optionally include indentation patch from James Bowlin
+  <bowlin@mindspring.com> (bug 346509). Thanks
 
   21 Jun 2010; Christian Faulhammer <fauli@gentoo.org> fish-1.23.1.ebuild:
   stable x86, bug 319473
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 2923f4d704e9..7ca8979129f3 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fish-1.22.3-gettext.patch 296 RMD160 06515465c69c4da0d791cac05cd0fd350cf7a848 SHA1 eb95eb7b30cacdb8d40489a531d6fd8416e55d28 SHA256 b68fe25bae61fa76ce140f5cae43e9b882ea05cf6f9d2d9d8fecd37e3a69c037
 AUX fish-1.23.0-gentoo-alt.patch 1792 RMD160 a550c39db0df1c3b4acdb3cb94cf0123b5e210ed SHA1 eb7d94b6133c3a4464cba5ce58f223c5ba78904d SHA256 f886ae1130048c86d2d93fcc158cf4725dabf15a88d730633ca62660a30a26db
 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
 DIST fish-1.23.0.tar.bz2 823193 RMD160 0c68e10552e843e8aec920175433ed252da2f040 SHA1 8f2c4ca6b760dde5d4c4f8d745c97ce9e283879f SHA256 ddd86de46d6736cb387ff8ab1aeffa679a93a5ebdab0ba679e3f7c2cac77d871
 DIST fish-1.23.1.tar.bz2 876148 RMD160 820b7a57f31b98a6faf1520b356a06422891e787 SHA1 3a6a5d0cfff348e5f9b1e7cd771865fd1dcd802e SHA256 1ea3d6532226c315993fabd6096ec865fdcde4d43df9e26f9ed020e11e631f93
 EBUILD fish-1.23.0.ebuild 1608 RMD160 ab082abb5e9205ac02d8bed6b1a75d96dcaf63f2 SHA1 6bb459aaec7369f117310a3af2ed6fbf8878280f SHA256 31488faf9b7c352946717ae1da0e11b5b93500b2fea2bf6391e636503fe697f4
+EBUILD fish-1.23.1-r1.ebuild 1730 RMD160 bdfb85df24418a77931673db8c4097bd589ef3cb SHA1 f54fc712650b6d62f0e8cb0030406b2c96b61d0c SHA256 21bfc4df23b4728b5eceacaf00ffe7cb83e54dd6cd17a61e4811520b54648d17
 EBUILD fish-1.23.1.ebuild 1635 RMD160 b1916f8c58f39fd12cb17182aa6ceb45313d1694 SHA1 816a4dbc43d06e1b4eaad59f3d5c56986e352ddb SHA256 63924b487baa20342a97bab02291da81f480e22811a0d6a10652acef91f752e8
-MISC ChangeLog 8594 RMD160 02fbb06af695c648f37536e7abed0ebee842b69d SHA1 aafc5f8494f3995eb904afb8034bd75f78d5cfd5 SHA256 9eb357e5dbef59eb6f078eb43f681b7d12734089f1b483a4b0a191d4322cdb3a
+MISC ChangeLog 8849 RMD160 466a542f3c2dc1444941b6ccc3389013e181b9c8 SHA1 b96c40c505fcfaaaa4200736c735f8d32a267f19 SHA256 12781aa2a46a15baf21d425ce0dce2ee1285eeed32d054aa7fb57c88843d8277
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkwfn0sACgkQNQqtfCuFneMXpACgkDt3QOyYQo8edOufWa4QM+PN
-A2wAn1cg8ogX2EALOGqgZkRuHYkciBBJ
-=YaHF
------END PGP SIGNATURE-----
diff --git a/app-shells/fish/files/fish-1.23.1-fish_indent.patch b/app-shells/fish/files/fish-1.23.1-fish_indent.patch
new file mode 100644
index 000000000000..513978e8b5c0
--- /dev/null
+++ b/app-shells/fish/files/fish-1.23.1-fish_indent.patch
@@ -0,0 +1,33 @@
+--- orig/fish_indent.c	2010-11-23 02:34:55.000000000 -0700
++++ fish-1.23.1/fish_indent.c	2010-11-23 02:35:29.000000000 -0700
+
+
+@@ -171,23 +171,23 @@
+ 			case TOK_REDIRECT_IN:
+ 			case TOK_REDIRECT_FD:
+ 			{
+-				sb_append( out, last );
++				/* sb_append( out, last ); */
+ 				switch( type )
+ 				{
+ 					case TOK_REDIRECT_OUT:
+-						sb_append( out, L"> " );
++						sb_append( out, L" > " );
+ 						break;
+ 						
+ 					case TOK_REDIRECT_APPEND:
+-						sb_append( out, L">> " );
++						sb_append( out, L" >> " );
+ 						break;
+ 						
+ 					case TOK_REDIRECT_IN:
+-						sb_append( out, L"< " );
++						sb_append( out, L" < " );
+ 						break;
+ 						
+ 					case TOK_REDIRECT_FD:
+-						sb_append( out, L">& " );
++						sb_append( out, L" >& " );
+ 						break;
+ 															
+ 				}
diff --git a/app-shells/fish/fish-1.23.1-r1.ebuild b/app-shells/fish/fish-1.23.1-r1.ebuild
new file mode 100644
index 000000000000..14e404ea4bad
--- /dev/null
+++ b/app-shells/fish/fish-1.23.1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2010 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-r1.ebuild,v 1.1 2010/11/27 23:28:06 xmw Exp $
+
+EAPI="3"
+
+inherit base autotools eutils
+
+DESCRIPTION="fish is the Friendly Interactive SHell"
+HOMEPAGE="http://fishshell.org/"
+SRC_URI="http://fishshell.org/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
+	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
+}