[gentoo-commits] gentoo-x86 commit in app-shells/fish: ChangeLog fish-1.23.1-r1.ebuild

[Michael Weber (xmw)]

xmw         10/11/27 23:28:06

  Modified:             ChangeLog
  Added:                fish-1.23.1-r1.ebuild
  Log:
  Revbump to optionally include identation patch
  
  (Portage version: 2.1.9.24/cvs/Linux x86_64)

Revision  Changes    Path
1.48                 app-shells/fish/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/fish/ChangeLog?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/fish/ChangeLog?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/fish/ChangeLog?r1=1.47&r2=1.48

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-shells/fish/ChangeLog,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ChangeLog	21 Jun 2010 17:19:29 -0000	1.47
+++ ChangeLog	27 Nov 2010 23:28:06 -0000	1.48
@@ -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@g.o> +fish-1.23.1-r1.ebuild,
+  +files/fish-1.23.1-fish_indent.patch:
+  Revbump to optionally include indentation patch from James Bowlin
+  <bowlin@××××××××××.com> (bug 346509). Thanks
 
   21 Jun 2010; Christian Faulhammer <fauli@g.o> fish-1.23.1.ebuild:
   stable x86, bug 319473



1.1                  app-shells/fish/fish-1.23.1-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/fish/fish-1.23.1-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/fish/fish-1.23.1-r1.ebuild?rev=1.1&content-type=text/plain

Index: fish-1.23.1-r1.ebuild
===================================================================
# 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
}