Added elog message for making manpage-completion functional (bug #490478). Removed www-client/htmlview from RDEPEND (bug #488012). Removed old versions

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

5 files changed, 34 insertions, 135 deletions

diff --git a/app-shells/fish/ChangeLog b/app-shells/fish/ChangeLog
index 34da0b0b1c1e..6361507a889e 100644
--- a/app-shells/fish/ChangeLog
+++ b/app-shells/fish/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-shells/fish
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/ChangeLog,v 1.62 2013/11/04 19:35:22 polynomial-c Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/ChangeLog,v 1.63 2014/02/11 12:28:14 polynomial-c Exp $
+
+*fish-2.1.0-r2 (11 Feb 2014)
+
+  11 Feb 2014; Lars Wendler <polynomial-c@gentoo.org> -fish-1.23.1.ebuild,
+  -fish-1.23.1-r2.ebuild, fish-2.0.0.ebuild, -fish-2.1.0-r1.ebuild,
+  +fish-2.1.0-r2.ebuild:
+  Added an elog message to install python for making manpage-completion
+  functional (bug #490478). Removed www-client/htmlview from RDEPEND and added
+  an elog note how to make the help system work (bug #488012). Removed old
+  versions.
 
   04 Nov 2013; Lars Wendler <polynomial-c@gentoo.org> metadata.xml:
   Took over maintenance.
diff --git a/app-shells/fish/fish-1.23.1-r2.ebuild b/app-shells/fish/fish-1.23.1-r2.ebuild
deleted file mode 100644
index 97c4fe96ea95..000000000000
--- a/app-shells/fish/fish-1.23.1-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 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.4 2012/06/06 06:17:52 jdhore 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
-}
diff --git a/app-shells/fish/fish-1.23.1.ebuild b/app-shells/fish/fish-1.23.1.ebuild
deleted file mode 100644
index 14428a03cf90..000000000000
--- a/app-shells/fish/fish-1.23.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.ebuild,v 1.6 2011/07/07 10:41:38 polynomial-c Exp $
-
-EAPI="3"
-
-inherit base autotools
-
-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"
-
-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
-
-	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
-}
diff --git a/app-shells/fish/fish-2.0.0.ebuild b/app-shells/fish/fish-2.0.0.ebuild
index d52e66580067..358fdf240874 100644
--- a/app-shells/fish/fish-2.0.0.ebuild
+++ b/app-shells/fish/fish-2.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/fish-2.0.0.ebuild,v 1.4 2013/09/05 19:24:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/fish-2.0.0.ebuild,v 1.5 2014/02/11 12:28:14 polynomial-c Exp $
 
 EAPI=5
 
@@ -18,7 +18,6 @@ IUSE="X"
 DEPEND="sys-libs/ncurses
 	sys-devel/bc
 	sys-devel/gettext
-	www-client/htmlview
 	X? ( x11-misc/xsel )"
 RDEPEND="${DEPEND}"
 
@@ -50,5 +49,9 @@ pkg_postinst() {
 	elog "To scan your man pages for completions, run 'fish_update_completions'"
 	elog "To autocomplete command suggestions press Ctrl + F or right arrow key."
 	elog
+	elog "Please add a \"BROWSER\" variable to ${PN}'s environment pointing to the"
+	elog "browser of your choice to get acces to ${PN}'s help system:"
+	elog "  BROWSER=\"/usr/bin/firefox\""
+	elog
 	elog "Have fun!"
 }
diff --git a/app-shells/fish/fish-2.1.0-r1.ebuild b/app-shells/fish/fish-2.1.0-r2.ebuild
index 18fd2a684374..085f757a6f25 100644
--- a/app-shells/fish/fish-2.1.0-r1.ebuild
+++ b/app-shells/fish/fish-2.1.0-r2.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/fish-2.1.0-r1.ebuild,v 1.1 2013/11/04 09:51:08 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/fish-2.1.0-r2.ebuild,v 1.1 2014/02/11 12:28:14 polynomial-c Exp $
 
 EAPI=5
 
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
 inherit base autotools
 
 DESCRIPTION="fish is the Friendly Interactive SHell"
@@ -19,8 +21,10 @@ IUSE="X"
 DEPEND="sys-libs/ncurses
 	sys-devel/bc
 	sys-devel/gettext
-	www-client/htmlview
 	X? ( x11-misc/xsel )"
+
+# fish can add man-page completions from lzma and xz compressed man pages
+# through a python script. That's why we depend on python here (bug #490478)
 RDEPEND="${DEPEND}"
 
 src_prepare() {
@@ -51,5 +55,14 @@ pkg_postinst() {
 	elog "To scan your man pages for completions, run 'fish_update_completions'"
 	elog "To autocomplete command suggestions press Ctrl + F or right arrow key."
 	elog
+	elog "Please add a \"BROWSER\" variable to ${PN}'s environment pointing to the"
+	elog "browser of your choice to get acces to ${PN}'s help system:"
+	elog "  BROWSER=\"/usr/bin/firefox\""
+	elog
+	elog "In order to get lzma and xz support for man-page completion please"
+	elog "emerge one of the following packages:"
+	elog "  dev-python/backports-lzma"
+	elog "  >=dev-lang/python-3.3"
+	elog
 	elog "Have fun!"
 }