Work around autofoo issues highlighted by gettext-0.15 - bug #142565

Package-Manager: portage-2.1.1_pre4-r2

3 files changed, 24 insertions, 15 deletions

diff --git a/app-text/hunspell/ChangeLog b/app-text/hunspell/ChangeLog
index 6cc109d237c8..7d5ef6df65fa 100644
--- a/app-text/hunspell/ChangeLog
+++ b/app-text/hunspell/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/hunspell
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.16 2006/07/15 22:43:49 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.17 2006/08/04 22:51:51 kevquinn Exp $
+
+  04 Aug 2006; Kevin F. Quinn <kevquinn@gentoo.org>
+  hunspell-1.1.4-r1.ebuild:
+  Work around autotools issues highlighted by gettext-0.15 - bug #142565
 
   15 Jul 2006; Joshua Jackson <tsunam@gentoo.org> hunspell-1.1.4-r1.ebuild:
   Stable x86; for openoffice
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 91ad01c87363..060d4209b80a 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -13,24 +13,24 @@ AUX hunspell-1.1.4-renameexes.patch 4615 RMD160 d987d3b2b83324f5da9fc0666aa97dc7
 MD5 16643338835908b307ac0da96bd2dbdb files/hunspell-1.1.4-renameexes.patch 4615
 RMD160 d987d3b2b83324f5da9fc0666aa97dc75fcd2005 files/hunspell-1.1.4-renameexes.patch 4615
 SHA256 91bdcb9bcbffeb11ff20fd09ac780b44af79d8be42be3163469d3c1c29649583 files/hunspell-1.1.4-renameexes.patch 4615
-DIST hunspell-1.1.3.tar.gz 437469 RMD160 b04ed38e54b7773e805760906c5d242df1888d7c SHA256 f49f648c3f1d22d54f11206734e88632a66547e6c20dfb08a2aa747e3f70d86e
+DIST hunspell-1.1.3.tar.gz 437469 RMD160 b04ed38e54b7773e805760906c5d242df1888d7c SHA1 5a006021180a9a8a61759cb02e43188ea5be50f2 SHA256 f49f648c3f1d22d54f11206734e88632a66547e6c20dfb08a2aa747e3f70d86e
 DIST hunspell-1.1.4.tar.gz 438667 RMD160 a90ded6b996d8b2d575268e8a4b025e92b85f378 SHA1 04251adfb351fe809756fc24ea56cd09ef2861a1 SHA256 8d39c03beb71ec1482d2fdbfc2d5b7690c8a70fb6da4885369752ee0d2e3a635
 EBUILD hunspell-1.1.3.ebuild 1710 RMD160 0ea1abe5aad779201474b96dc6b8c45c337279f9 SHA1 4cd396da07111b9b2ef6adc7092682358c73ec72 SHA256 80bbba53fcb8822faa4e4ff42ab0627252181320ad0f417e57882432c44fe915
 MD5 6c27bd8351e45b24f183ddca92c7fba8 hunspell-1.1.3.ebuild 1710
 RMD160 0ea1abe5aad779201474b96dc6b8c45c337279f9 hunspell-1.1.3.ebuild 1710
 SHA256 80bbba53fcb8822faa4e4ff42ab0627252181320ad0f417e57882432c44fe915 hunspell-1.1.3.ebuild 1710
-EBUILD hunspell-1.1.4-r1.ebuild 2236 RMD160 aad9caad27ab1fbf7096f9f0b62bc097967565dc SHA1 4cb9180abcf0cfc30246407f3b26031d462318e9 SHA256 44fa6a4be1ede5604b9fa4105c05f7f50ffca77d200d742665ef12be2999ac01
-MD5 86e0cbff7b356b77b341da7569a9036a hunspell-1.1.4-r1.ebuild 2236
-RMD160 aad9caad27ab1fbf7096f9f0b62bc097967565dc hunspell-1.1.4-r1.ebuild 2236
-SHA256 44fa6a4be1ede5604b9fa4105c05f7f50ffca77d200d742665ef12be2999ac01 hunspell-1.1.4-r1.ebuild 2236
+EBUILD hunspell-1.1.4-r1.ebuild 2464 RMD160 3292e4f942854512437263cb3b2c4c52adf98fdd SHA1 385efe84110b896d400db2bfbeaad95c3ae00611 SHA256 6350642099915290f2f15674b1108a9908a21c4e7e621169f7f0d4f892d92996
+MD5 0991501559b41ebf9baee6de57fca077 hunspell-1.1.4-r1.ebuild 2464
+RMD160 3292e4f942854512437263cb3b2c4c52adf98fdd hunspell-1.1.4-r1.ebuild 2464
+SHA256 6350642099915290f2f15674b1108a9908a21c4e7e621169f7f0d4f892d92996 hunspell-1.1.4-r1.ebuild 2464
 EBUILD hunspell-1.1.4.ebuild 1889 RMD160 02aa24fc15a9bd5ef259f69ccf8abf0cadf7aa74 SHA1 402daa8b13dd392b7f28b5d71e3bd9ad2e25f059 SHA256 a4e2a46380f410d90cfe29fc66f98b2afcffc0ad4dbaadd795245d1b0c67ff1d
 MD5 cdfb2bd272e3ea9f73d637c488e0bd27 hunspell-1.1.4.ebuild 1889
 RMD160 02aa24fc15a9bd5ef259f69ccf8abf0cadf7aa74 hunspell-1.1.4.ebuild 1889
 SHA256 a4e2a46380f410d90cfe29fc66f98b2afcffc0ad4dbaadd795245d1b0c67ff1d hunspell-1.1.4.ebuild 1889
-MISC ChangeLog 2323 RMD160 774bfd2870ce173b8a8f453bee0fdd35bfda6dfd SHA1 ce1f3f307a4e7ec9bbd78a6fa220cf4548b0e660 SHA256 fcedec4c48cecc6e904efc75a99bffb0a37e0be7675f900b092d992ab5db4500
-MD5 c53025b380c89966e0eff4fc7e03d9db ChangeLog 2323
-RMD160 774bfd2870ce173b8a8f453bee0fdd35bfda6dfd ChangeLog 2323
-SHA256 fcedec4c48cecc6e904efc75a99bffb0a37e0be7675f900b092d992ab5db4500 ChangeLog 2323
+MISC ChangeLog 2479 RMD160 e47af8a7237d4cc8d2ebf756965602f6b9cfe2d6 SHA1 ceb105aaf8274f3eb82739b2b0a925311be8c652 SHA256 0047a1bfe4c51f5c6ea4bbfc80b6a5948a39f9b8835e3ae8895e3968be50cd4c
+MD5 db426f2812784c60ecc470dcb30b3d13 ChangeLog 2479
+RMD160 e47af8a7237d4cc8d2ebf756965602f6b9cfe2d6 ChangeLog 2479
+SHA256 0047a1bfe4c51f5c6ea4bbfc80b6a5948a39f9b8835e3ae8895e3968be50cd4c ChangeLog 2479
 MISC metadata.xml 222 RMD160 a74fc306077c440fea351793a03168651fb28f13 SHA1 45da96e6af3a3e7898ca55691d0e07583b6c75bf SHA256 5e7b34981ea08b001bd6eac085d6876fbeef6a4fdd91575e4e9f988cadf4f03f
 MD5 b86e3c93f969dbb4f433611cb0f6b0b0 metadata.xml 222
 RMD160 a74fc306077c440fea351793a03168651fb28f13 metadata.xml 222
@@ -45,9 +45,9 @@ MD5 2acdba27673f2a9db779932d38020c9b files/digest-hunspell-1.1.4-r1 244
 RMD160 ed8fcd1f97b2840c563fa8aeebadf1f943a42249 files/digest-hunspell-1.1.4-r1 244
 SHA256 79ec82c9c39e4a5050b2167c57df3360dd2ce8108230df591025f2974c981300 files/digest-hunspell-1.1.4-r1 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEuW/X2ZWR0Jhg/EsRAm60AJ0V1tlNiRqOdXmnjZ4kfHw8XvaDCgCeOmGq
-+2bwt495Rt0Emk7R+uLCi8s=
-=mtam
+iD8DBQFE08+dZfNLSOUrp0sRAj8JAKCZ49h9iavLGsiBLGQnWmwsgKuxpACfe/M1
+1Cq33X1znoAhJHiA4/zzI0M=
+=0JH6
 -----END PGP SIGNATURE-----
diff --git a/app-text/hunspell/hunspell-1.1.4-r1.ebuild b/app-text/hunspell/hunspell-1.1.4-r1.ebuild
index 23135b147562..af77ef1641e3 100644
--- a/app-text/hunspell/hunspell-1.1.4-r1.ebuild
+++ b/app-text/hunspell/hunspell-1.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.1.4-r1.ebuild,v 1.7 2006/07/15 22:43:49 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.1.4-r1.ebuild,v 1.8 2006/08/04 22:51:51 kevquinn Exp $
 
 inherit eutils multilib autotools libtool
 
@@ -32,6 +32,11 @@ src_unpack() {
 	# Also includes a small change for libtool.
 	epatch "${FILESDIR}/${P}-renameexes.patch"
 
+	# Set AT_M4DIR to workaround eautoreconf limitation, and copy
+	# mkinstalldirs script to the po subdirectory for compatibility
+	# with gettext-0.15 (see bug #142565)
+	cp ${S}/mkinstalldirs ${S}/po/
+	export AT_M4DIR="${S}/m4"
 	# Makefile.am modified, libtool added, hence autoreconfi
 	# and elibtoolize.
 	WANT_AUTOMAKE="1.9" eautoreconf