diff options
| -rw-r--r-- | app-shells/fish/ChangeLog | 8 | ||||
| -rw-r--r-- | app-shells/fish/Manifest | 15 | ||||
| -rw-r--r-- | app-shells/fish/files/fish-1.23.1-gentoo-alt.patch | 79 | ||||
| -rw-r--r-- | app-shells/fish/fish-1.23.1.ebuild | 60 |
4 files changed, 150 insertions, 12 deletions
diff --git a/app-shells/fish/ChangeLog b/app-shells/fish/ChangeLog index 5ea0edd7e943..e724cad94008 100644 --- a/app-shells/fish/ChangeLog +++ b/app-shells/fish/ChangeLog @@ -1,6 +1,12 @@ # 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.42 2010/04/06 21:52:06 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/ChangeLog,v 1.43 2010/04/09 04:11:37 polynomial-c Exp $ + +*fish-1.23.1 (09 Apr 2010) + + 09 Apr 2010; Lars Wendler <polynomial-c@gentoo.org> +fish-1.23.1.ebuild, + +files/fish-1.23.1-gentoo-alt.patch: + version bump 06 Apr 2010; Jonathan Callen <abcd@gentoo.org> fish-1.23.0.ebuild: Fix typo (configure -> prepare) diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest index 4d9b78ac7fa2..6e87b72e7c35 100644 --- a/app-shells/fish/Manifest +++ b/app-shells/fish/Manifest @@ -1,17 +1,10 @@ ------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-gentoo-alt.patch 1980 RMD160 d04edbbe4a1b87d1f6230f4f2a0f332279fe4d9b SHA1 1665e88e7dba7c479f012343007ab81bd0e94296 SHA256 e780a1e8648ea6ac20ab1dddf1eb054d8aaf0d0b4bbfbc6d5315abe742ddc87b 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 -MISC ChangeLog 7940 RMD160 e1c448599a2eeed4c025c3022c6464a1ddd6bba0 SHA1 24546a402895740144b43b7adf49ecb9d0a3c3ad SHA256 3832f2282e03ce16181e27184294fe2ca3af0e5df8840f4c40b30e9e73eca115 +EBUILD fish-1.23.1.ebuild 1626 RMD160 e025e2f77b11e76e9079d816e8083be5975cea8c SHA1 cfca5eab57abd153d186ab10e9822f6ff0b87960 SHA256 9239dda9abb644cb48228f96c3b9be9617c1b75de419d92f9b252410094bef2d +MISC ChangeLog 8106 RMD160 a9c897ec9249f5c84bdf8c3c3b45d293de584ef7 SHA1 7d24f0f3f265ca90ae5f93e57e4fa73b500e94a6 SHA256 fc0ff0a0ad488f7606ed0672e8a892c8972b0ae262dfefd369aa6d66aa93ba2e MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAku7rQ8ACgkQOypDUo0oQOqMwgCdFvSy+adPvwTgKfDRT5hGWvUq -disAn0kdqXcnuH9ePcYTx+MCoC3uZOsi -=JT3A ------END PGP SIGNATURE----- diff --git a/app-shells/fish/files/fish-1.23.1-gentoo-alt.patch b/app-shells/fish/files/fish-1.23.1-gentoo-alt.patch new file mode 100644 index 000000000000..6fe16cd3ac45 --- /dev/null +++ b/app-shells/fish/files/fish-1.23.1-gentoo-alt.patch @@ -0,0 +1,79 @@ +* Remove Darwin cruft, remove some Solaris misdetection crap, add + AM_ICONV instead of weird iconv check that not suprisingly fails on + Darwin. + +--- fish-1.23.1/configure.ac ++++ fish-1.23.1/configure.ac +@@ -91,45 +91,6 @@ + + + # +-# Detect directories which may contain additional headers, libraries +-# and commands. This needs to be done early - before Autoconf starts +-# to mess with CFLAGS and all the other environemnt variables. +-# +-# This mostly helps OS X users, since fink usually installs out of +-# tree and doesn't update CFLAGS. +-# +- +-for i in /usr/pkg /sw /opt /opt/local; do +- +- AC_MSG_CHECKING([for $i/include include directory]) +- if test -d $i/include; then +- AC_MSG_RESULT(yes) +- CPPFLAGS="$CPPFLAGS -I$i/include/" +- CFLAGS="$CFLAGS -I$i/include/" +- else +- AC_MSG_RESULT(no) +- fi +- +- AC_MSG_CHECKING([for $i/lib library directory]) +- if test -d $i/lib; then +- AC_MSG_RESULT(yes) +- LDFLAGS="$LDFLAGS -L$i/lib/ -R$i/lib/" +- else +- AC_MSG_RESULT(no) +- fi +- +- AC_MSG_CHECKING([for $i/bin command directory]) +- if test -d $i/bin; then +- AC_MSG_RESULT(yes) +- optbindirs="$optbindirs $i/bin" +- else +- AC_MSG_RESULT(no) +- fi +- +-done +- +- +-# + # Tell autoconf to create config.h header + # + AC_CONFIG_HEADERS(config.h) +@@ -153,10 +114,7 @@ + # Set up various programs needed for install + # + +-# Here we look for c99 before cc as Sun Studio compiler supports c99 +-# through the c99 binary. +- +-AC_PROG_CC([gcc c99 cc]) ++AC_PROG_CC + AC_PROG_CPP + AC_PROG_INSTALL + +@@ -519,12 +477,8 @@ + AC_SEARCH_LIBS( gettext, intl,,) + fi + +-# Check for libiconv_open if we can't find iconv_open. Silly OS X does +-# weird macro magic for the sole purpose of amusing me. +-AC_SEARCH_LIBS( iconv_open, iconv, , [AC_SEARCH_LIBS( libiconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )] ) +- +-LIBS_FISH=$LIBS +-LIBS=$LIBS_COMMON ++LIBS_FISH="$LIBS $LIBICONV" ++LIBS="$LIBS_COMMON $LIBICONV" + + # + # Check for libraries needed by fish_indent. diff --git a/app-shells/fish/fish-1.23.1.ebuild b/app-shells/fish/fish-1.23.1.ebuild new file mode 100644 index 000000000000..468155820266 --- /dev/null +++ b/app-shells/fish/fish-1.23.1.ebuild @@ -0,0 +1,60 @@ +# 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.ebuild,v 1.1 2010/04/09 04:11:37 polynomial-c Exp $ + +EAPI="3" + +inherit base autotools + +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" + +DEPEND="sys-libs/ncurses + sys-devel/bc + 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 +} |