(#161476) Bump. (#151900) Install to /bin so it's usable as a default shell when /usr is unavailable. Still needs an entry in /etc/shells, though. Use emake for install instead of make, so MAKEOPTS gets passed through. Seems to work fine in parallel.

Package-Manager: portage-2.1.2

4 files changed, 73 insertions, 6 deletions

diff --git a/app-shells/fish/ChangeLog b/app-shells/fish/ChangeLog
index e61ce8bc6d41..d6082fd022b5 100644
--- a/app-shells/fish/ChangeLog
+++ b/app-shells/fish/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-shells/fish
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/ChangeLog,v 1.26 2006/12/02 01:47:39 antarus Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/ChangeLog,v 1.27 2007/01/18 15:56:29 dberkholz Exp $
+
+*fish-1.22.2 (18 Jan 2007)
+
+  18 Jan 2007; Donnie Berkholz <dberkholz@gentoo.org>; +fish-1.22.2.ebuild:
+  (#161476) Bump. (#151900) Install to /bin so it's usable as a default shell
+  when /usr is unavailable. Still needs an entry in /etc/shells, though. Use
+  emake for install instead of make, so MAKEOPTS gets passed through. Seems to
+  work fine in parallel.
 
   02 Dec 2006; Alec Warner <antarus@gentoo.org> fish-1.21.8.ebuild,
   fish-1.21.12.ebuild, fish-1.22.1.ebuild:
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 2ba1013cff44..e60fb592b9c7 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,6 +1,7 @@
 DIST fish-1.21.12.tar.bz2 706246 RMD160 b8172eee345fe84959acc88f242742bcf1018e50 SHA1 8ab4da3ffc4acb5cd56e395bdbef83eb6c8cf8ab SHA256 4235fc3d14ae39fad792eb288f1117cb9578bbc0f6076fb213aafb1848bec9c0
 DIST fish-1.21.8.tar.bz2 572197 RMD160 68cfaf807b45a8652dfd486169ef829ba37c6427 SHA1 bfb5fae340d2b253d6bf241765d6282de5dec80a SHA256 49e8a4e289ca9a6acace39a0056dd5abc335940904c8a11034dd52b98f2afd38
 DIST fish-1.22.1.tar.bz2 733413 RMD160 5dc03d8d91b68bebeebe6c26a2e5b7484e0b0e9a SHA1 24727d9ff87cb868ef9d4f3db34098bfe2cdce74 SHA256 98704c6098f830c2e3b7ab667f88641cda85e53cb29b4e81bb267fe5b4c61ded
+DIST fish-1.22.2.tar.bz2 719445 RMD160 c3e59794e35c0af85ad923af79e543db21ac8f76 SHA1 1070d6d455e54b19e1989085355f501ab0a88381 SHA256 9af58871ee80ea0b80f15e5d2d95957973b2cc6a2f3f8a61b518cd55b561add0
 EBUILD fish-1.21.12.ebuild 1310 RMD160 a9df46f08a92ecd1fc5771aacc25409c9eda217d SHA1 4044cda8168fbee68ec34952022a75c8788b16b3 SHA256 be3738eeafed8f007f239b64f6373d1bcc8f4ea845de18144e95442432dea336
 MD5 9e20bfb556eff75141fcbb6e98b25136 fish-1.21.12.ebuild 1310
 RMD160 a9df46f08a92ecd1fc5771aacc25409c9eda217d fish-1.21.12.ebuild 1310
@@ -13,10 +14,14 @@ EBUILD fish-1.22.1.ebuild 1309 RMD160 96379a749e075854289e6aab1c98eb0fa748a45c S
 MD5 46f61feb3d39fa65ab8dac91ea9fe571 fish-1.22.1.ebuild 1309
 RMD160 96379a749e075854289e6aab1c98eb0fa748a45c fish-1.22.1.ebuild 1309
 SHA256 23b8104ace2821c33e6bc8ffbfad4f810ec61694307c7c8c0d78731bb65429cf fish-1.22.1.ebuild 1309
-MISC ChangeLog 5525 RMD160 fbd2bc1f462ea6e529cd72d445f5dc20ed05438e SHA1 62220b0a8fe71eda202aedc9ada34b27f3d6a16c SHA256 bc57d7ea86060defdd9a488703b2a63dda8a269b486403a26f65431c4145563a
-MD5 e3d29631206339340e5dfd70a51f19ab ChangeLog 5525
-RMD160 fbd2bc1f462ea6e529cd72d445f5dc20ed05438e ChangeLog 5525
-SHA256 bc57d7ea86060defdd9a488703b2a63dda8a269b486403a26f65431c4145563a ChangeLog 5525
+EBUILD fish-1.22.2.ebuild 1408 RMD160 385312c4b2b1f8120d149b702e9df75bb26bdb44 SHA1 b3d2c0558e38c4c7e11a812664c159bb39c8d50f SHA256 ee8656dcb973271a73b574aaba9dcb9a904dd9cfce69c743526d1769ee717c5e
+MD5 5ff461b077c76043c6540f7e7759ffde fish-1.22.2.ebuild 1408
+RMD160 385312c4b2b1f8120d149b702e9df75bb26bdb44 fish-1.22.2.ebuild 1408
+SHA256 ee8656dcb973271a73b574aaba9dcb9a904dd9cfce69c743526d1769ee717c5e fish-1.22.2.ebuild 1408
+MISC ChangeLog 5891 RMD160 b894c31fd5446a819be0f943825f1627be89f9cb SHA1 3b7f62a375e9015898551bd3d068f142752b0877 SHA256 28ccfc68ab9ae87550c770d91a2b5bbf3879a37645d10d1b022e6ab5e5f7f457
+MD5 df1f5de36e798358af7ed9472e0d86ee ChangeLog 5891
+RMD160 b894c31fd5446a819be0f943825f1627be89f9cb ChangeLog 5891
+SHA256 28ccfc68ab9ae87550c770d91a2b5bbf3879a37645d10d1b022e6ab5e5f7f457 ChangeLog 5891
 MISC metadata.xml 225 RMD160 7d34ec0d318713a7c56169cd33b6e37c466ea28c SHA1 60ce86a1f6f02dce594e21d3c794bcbe7758a7c2 SHA256 347ac757bb9b39010be57bc7d7ebcb29aa458f6b5071815bfea9d2c097a8d524
 MD5 e69d4c129576d9fedc52e5ef317a4a5c metadata.xml 225
 RMD160 7d34ec0d318713a7c56169cd33b6e37c466ea28c metadata.xml 225
@@ -30,3 +35,6 @@ SHA256 76cc3228001d1c6087d4f75d0066c842b3e28179a4e53c5b15fb303ea83b43d6 files/di
 MD5 f60fb8a5fc0977bc5a320ececaa0222d files/digest-fish-1.22.1 238
 RMD160 2503cffc9c543b6b70e615e608aea7e0183e1959 files/digest-fish-1.22.1 238
 SHA256 985ef9fb161c11061e89a5a1ceb164ae28e4fd23073dc16d11897a204a42dfe2 files/digest-fish-1.22.1 238
+MD5 aafb9edcdc21c0c968003c46e8ad5154 files/digest-fish-1.22.2 238
+RMD160 42611e7c44797825071432d5b31fe3c7b9a28b03 files/digest-fish-1.22.2 238
+SHA256 abdde1ec4157a786ea94a481e4a9b2c03797e44fa9ad08d56f0a684c4071cff3 files/digest-fish-1.22.2 238
diff --git a/app-shells/fish/files/digest-fish-1.22.2 b/app-shells/fish/files/digest-fish-1.22.2
new file mode 100644
index 000000000000..efa173155088
--- /dev/null
+++ b/app-shells/fish/files/digest-fish-1.22.2
@@ -0,0 +1,3 @@
+MD5 4009d786d26884a1dc06bf7547434dc7 fish-1.22.2.tar.bz2 719445
+RMD160 c3e59794e35c0af85ad923af79e543db21ac8f76 fish-1.22.2.tar.bz2 719445
+SHA256 9af58871ee80ea0b80f15e5d2d95957973b2cc6a2f3f8a61b518cd55b561add0 fish-1.22.2.tar.bz2 719445
diff --git a/app-shells/fish/fish-1.22.2.ebuild b/app-shells/fish/fish-1.22.2.ebuild
new file mode 100644
index 000000000000..63cbde7c1da4
--- /dev/null
+++ b/app-shells/fish/fish-1.22.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/fish-1.22.2.ebuild,v 1.1 2007/01/18 15:56:29 dberkholz Exp $
+
+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"
+IUSE="doc X"
+RDEPEND="sys-libs/ncurses
+	sys-devel/bc
+	www-client/htmlview
+	X? ( x11-misc/xsel )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+src_compile() {
+	# 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=/usr/share/doc/${PF} \
+		--without-xsel \
+		--bindir=/bin \
+		|| die "econf failed"
+	emake || die "emake failed"
+	if use doc; then
+		emake doc || die "emake doc failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+}
+
+pkg_postinst() {
+	einfo
+	einfo "To use ${PN} as your default shell, you need to add /bin/${PN}"
+	einfo "to /etc/shells."
+	einfo
+	ewarn "Many files moved to ${ROOT}usr/share/fish/completions from /etc/fish.d/."
+	ewarn "Delete everything in ${ROOT}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."
+	einfo
+}