Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 470144 - app-shells/fish-2.0.0 version bump
Summary: app-shells/fish-2.0.0 version bump
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: New packages (show other bugs)
Hardware: All Linux
: Normal enhancement with 2 votes (vote)
Assignee: Jeff (JD) Horelick (RETIRED)
URL:
Whiteboard:
Keywords: EBUILD, PATCH
Depends on:
Blocks:
 
Reported: 2013-05-17 08:38 UTC by Elis Axelsson
Modified: 2013-07-08 20:30 UTC (History)
3 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
ebuild for fish-2.0.0 (fish-2.0.0.ebuild,938 bytes, text/plain)
2013-05-17 08:47 UTC, Elis Axelsson
Details
ebuild for fish-2.0.0 (fish-2.0.0.ebuild,1.03 KB, text/plain)
2013-06-05 15:57 UTC, George Waksman
Details
ebuild for fish-2.0.0 (fish-2.0.0.ebuild,1.30 KB, text/plain)
2013-06-11 17:32 UTC, George Waksman
Details
ebuild for fish-2.0.0 (fish-2.0.0.ebuild,1.30 KB, text/plain)
2013-06-17 00:56 UTC, George Waksman
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Elis Axelsson 2013-05-17 08:38:07 UTC
About a year ago, the old fish-shell got forked into fishfish. Today fishfish was released as fish-2.0.0 in the name of the original fish-shell.

One change is that fish-2.0.0 doesn't bundle xsel anymore, so no need for configure-flags to disable that in the ebuild.

Reproducible: Always
Comment 1 Elis Axelsson 2013-05-17 08:47:49 UTC
Created attachment 348500 [details]
ebuild for fish-2.0.0
Comment 2 Jeroen Roovers (RETIRED) gentoo-dev 2013-05-17 13:41:16 UTC
Comment on attachment 348500 [details]
ebuild for fish-2.0.0

--- fish-1.23.1-r2.ebuild       2012-06-06 14:55:12.000000000 +0200
+++ -   2013-05-17 15:40:56.081362282 +0200
@@ -1,66 +1,50 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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 $
+# $Header: $
 
 EAPI="4"

-inherit base autotools eutils
+inherit base autotools
 
 DESCRIPTION="fish is the Friendly Interactive SHell"
 HOMEPAGE="http://fishshell.com/"
-SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.bz2"
+
+SRC_URI="http://fishshell.com/files/${PV}/fish.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="X vanilla"
+KEYWORDS="~x86 ~amd64"
+IUSE="X"

-DEPEND="sys-libs/ncurses
+DEPEND="app-doc/doxygen
+       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
+RDEPEND=""

-       if ! use vanilla ; then
-               epatch "${FILESDIR}"/${P}-fish_indent.patch
-               epatch "${FILESDIR}"/${P}-multi-line_prompts.patch
-       fi
+src_unpack() {
+       unpack ${A}
+       mv ${PN} ${S}
+       cd ${S}
+}

-       eautoreconf
+src_prepare() {
+       eautoconf
 }
 
 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 \
+       econf                                           \
                docdir="${EPREFIX}"/usr/share/doc/${PF} \
-               --without-xsel \
-               --bindir="${EPREFIX}"/bin
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "make install failed"
+               --bindir="${EPREFIX}"/bin               \
+               --prefix="${EPREFIX}"
 }
 
 pkg_postinst() {
        elog
-       elog "To use ${PN} as your default shell, you need to add ${EPREFIX}/bin/${PN}"
-       elog "to ${EPREFIX}/etc/shells."
+       elog "To use ${PN} as your default shell, you need to add /bin/fish"
+       elog "to /etc/shells and change your login shell to /bin/fish."
        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
 }
Comment 3 George Waksman 2013-06-05 15:57:12 UTC
Created attachment 350222 [details]
ebuild for fish-2.0.0

Here's an ebuild for fish-2.0.0 that I put together and have been using on amd64 for a few days. So far, I have had no problems with it.
Comment 4 George Waksman 2013-06-11 17:32:41 UTC
Created attachment 350766 [details]
ebuild for fish-2.0.0

updated and slightly cleaned up ebuild

Removed some unnecessary sections and have tried to increase conformance with documented coding standards.
Comment 5 George Waksman 2013-06-17 00:56:54 UTC
Created attachment 351160 [details]
ebuild for fish-2.0.0

Updated EAPI to EAPI=5
Comment 6 Lars Wendler (Polynomial-C) (RETIRED) gentoo-dev 2013-06-20 07:14:50 UTC
What's keeping this bug from getting fixed?
Comment 7 Elis Axelsson 2013-06-27 07:26:55 UTC
Sleeping maintainer from what I heard... :(
Comment 8 George Waksman 2013-07-08 16:20:36 UTC
Can we get this bug (and the fish package) reassigned to maintainer-needed or another developer somehow?
Comment 9 Lars Wendler (Polynomial-C) (RETIRED) gentoo-dev 2013-07-08 20:30:07 UTC
+*fish-2.0.0 (08 Jul 2013)
+
+  08 Jul 2013; Lars Wendler <polynomial-c@gentoo.org> +fish-2.0.0.ebuild:
+  Non-maintainer commit: Version bump (bug #470144).
+