Update gentoo-alt patch to make iconv work again, and not wrongly reported as failing

Package-Manager: portage-2.2.00.15842-prefix/cvs/Darwin powerpc

4 files changed, 29 insertions, 6 deletions

diff --git a/app-shells/fish/ChangeLog b/app-shells/fish/ChangeLog
index e724cad94008..661c93290a29 100644
--- a/app-shells/fish/ChangeLog
+++ b/app-shells/fish/ChangeLog
@@ -1,6 +1,11 @@
 # 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.43 2010/04/09 04:11:37 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/ChangeLog,v 1.44 2010/04/18 12:58:23 grobian Exp $
+
+  18 Apr 2010; Fabian Groffen <grobian@gentoo.org> fish-1.23.1.ebuild,
+  files/fish-1.23.1-gentoo-alt.patch:
+  Update gentoo-alt patch to make iconv work again, and not wrongly reported
+  as failing
 
 *fish-1.23.1 (09 Apr 2010)
 
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 6e87b72e7c35..67d3e5012c2f 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,10 +1,10 @@
 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
+AUX fish-1.23.1-gentoo-alt.patch 2507 RMD160 96ee802017f07c8fb5255c0790878b701ed1de73 SHA1 9f9bbaf14043b918aad1e3bcbc36403a8a5de211 SHA256 b3491f7456e33231bf7a8ab3d61996b86c088c0e721fadc56c534d23267e5795
 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
-EBUILD fish-1.23.1.ebuild 1626 RMD160 e025e2f77b11e76e9079d816e8083be5975cea8c SHA1 cfca5eab57abd153d186ab10e9822f6ff0b87960 SHA256 9239dda9abb644cb48228f96c3b9be9617c1b75de419d92f9b252410094bef2d
-MISC ChangeLog 8106 RMD160 a9c897ec9249f5c84bdf8c3c3b45d293de584ef7 SHA1 7d24f0f3f265ca90ae5f93e57e4fa73b500e94a6 SHA256 fc0ff0a0ad488f7606ed0672e8a892c8972b0ae262dfefd369aa6d66aa93ba2e
+EBUILD fish-1.23.1.ebuild 1640 RMD160 efb0a700e3234da788e8be3974bf1163859b20a6 SHA1 2faf1f9da9da0d65cdcbff04677acdb5e4275207 SHA256 8d25060c1e1682ee35e3f0b473f9ac3043f0c8cb5c23985e6d961dc901d29f1f
+MISC ChangeLog 8301 RMD160 4659c794bddd57820f969a421e5f6aa34c726aff SHA1 b3cf672c725863c00284de1ea4afde81d923949c SHA256 737889df6b5a6b435f5e785ddc1fa2dac9a2aa3e199d8f8459f81d74d7176416
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
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
index 6fe16cd3ac45..efbeb3417a39 100644
--- a/app-shells/fish/files/fish-1.23.1-gentoo-alt.patch
+++ b/app-shells/fish/files/fish-1.23.1-gentoo-alt.patch
@@ -62,7 +62,7 @@
  AC_PROG_CPP
  AC_PROG_INSTALL
  
-@@ -519,12 +477,8 @@
+@@ -419,12 +477,9 @@
  	AC_SEARCH_LIBS( gettext, intl,,)
  fi
  
@@ -72,8 +72,25 @@
 -
 -LIBS_FISH=$LIBS
 -LIBS=$LIBS_COMMON
++AM_ICONV
 +LIBS_FISH="$LIBS $LIBICONV"
 +LIBS="$LIBS_COMMON $LIBICONV"
  
  #
  # Check for libraries needed by fish_indent. 
+@@ -504,7 +504,6 @@
+ if test x$local_gettext != xno; then 
+ 	AC_SEARCH_LIBS( gettext, intl,,)
+ fi
+-AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )
+ LIBS_FISH_PAGER=$LIBS
+ LIBS=$LIBS_COMMON
+ 
+@@ -516,7 +516,6 @@
+ if test x$local_gettext != xno; then 
+ 	AC_SEARCH_LIBS( gettext, intl,,)
+ fi
+-AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )
+ LIBS_FISHD=$LIBS
+ LIBS=$LIBS_COMMON
+ 
diff --git a/app-shells/fish/fish-1.23.1.ebuild b/app-shells/fish/fish-1.23.1.ebuild
index 468155820266..2a9b47a49c09 100644
--- a/app-shells/fish/fish-1.23.1.ebuild
+++ b/app-shells/fish/fish-1.23.1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/fish-1.23.1.ebuild,v 1.2 2010/04/18 12:58:23 grobian Exp $
 
 EAPI="3"
 
@@ -17,6 +17,7 @@ IUSE="X"
 
 DEPEND="sys-libs/ncurses
 	sys-devel/bc
+	sys-devel/gettext
 	www-client/htmlview
 	X? ( x11-misc/xsel )"
 RDEPEND="${DEPEND}"