Fix mkinstalldirs issue properly, as advised by SpanKY (bug #142565)

Package-Manager: portage-2.1.1_pre4-r2

3 files changed, 21 insertions, 17 deletions

diff --git a/app-text/hunspell/ChangeLog b/app-text/hunspell/ChangeLog
index 7d5ef6df65fa..ab6ef9883f18 100644
--- a/app-text/hunspell/ChangeLog
+++ b/app-text/hunspell/ChangeLog
@@ -1,6 +1,11 @@
 # 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.17 2006/08/04 22:51:51 kevquinn Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.18 2006/08/06 01:25:54 kevquinn Exp $
+
+  06 Aug 2006; Kevin F. Quinn <kevquinn@gentoo.org>
+  hunspell-1.1.4-r1.ebuild:
+  Fix mkinstalldirs issue properly, as advised by SpanKY (bug #142565)
+  Also various tidy-ups by SpanKY.
 
   04 Aug 2006; Kevin F. Quinn <kevquinn@gentoo.org>
   hunspell-1.1.4-r1.ebuild:
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index bfec1d014dd5..2c5cda284998 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -19,18 +19,18 @@ EBUILD hunspell-1.1.3.ebuild 1710 RMD160 0ea1abe5aad779201474b96dc6b8c45c337279f
 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 2357 RMD160 c7514cff1bfe61ef7177ee6512da9266eee6856b SHA1 19ce0352286b0d5a74ccab0ab0e7074caa173816 SHA256 51bb2893bf32cabc04a843fbfd5a795ebaa204e1a75c26f100c28381a9a4d6fe
-MD5 ff659093d7cef4c74cf652e071dfe9d3 hunspell-1.1.4-r1.ebuild 2357
-RMD160 c7514cff1bfe61ef7177ee6512da9266eee6856b hunspell-1.1.4-r1.ebuild 2357
-SHA256 51bb2893bf32cabc04a843fbfd5a795ebaa204e1a75c26f100c28381a9a4d6fe hunspell-1.1.4-r1.ebuild 2357
+EBUILD hunspell-1.1.4-r1.ebuild 2333 RMD160 781dcf387ed12999841de63095bac183e7d8b888 SHA1 3e5276a9c1efdcb4482bc221e519c37340ee2545 SHA256 c7a03548e24291c4c45df6268519d0ab986bdd0f7837edfd7c13663572aa87a2
+MD5 89a79127a800cbb4835ac008c965a6f5 hunspell-1.1.4-r1.ebuild 2333
+RMD160 781dcf387ed12999841de63095bac183e7d8b888 hunspell-1.1.4-r1.ebuild 2333
+SHA256 c7a03548e24291c4c45df6268519d0ab986bdd0f7837edfd7c13663572aa87a2 hunspell-1.1.4-r1.ebuild 2333
 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 2479 RMD160 e47af8a7237d4cc8d2ebf756965602f6b9cfe2d6 SHA1 ceb105aaf8274f3eb82739b2b0a925311be8c652 SHA256 0047a1bfe4c51f5c6ea4bbfc80b6a5948a39f9b8835e3ae8895e3968be50cd4c
-MD5 db426f2812784c60ecc470dcb30b3d13 ChangeLog 2479
-RMD160 e47af8a7237d4cc8d2ebf756965602f6b9cfe2d6 ChangeLog 2479
-SHA256 0047a1bfe4c51f5c6ea4bbfc80b6a5948a39f9b8835e3ae8895e3968be50cd4c ChangeLog 2479
+MISC ChangeLog 2666 RMD160 27ba525e88bc7bafe650c693eb41361665e57cf7 SHA1 4a14eb598d8e1b002e3bcbf452e74432eff3e231 SHA256 ba0c304b9563531e3b34f48456beb2bb03f3b06f82a5434fa4dbcd26c4aaeb7f
+MD5 a634eea86cda5a8c0730629ca4de6319 ChangeLog 2666
+RMD160 27ba525e88bc7bafe650c693eb41361665e57cf7 ChangeLog 2666
+SHA256 ba0c304b9563531e3b34f48456beb2bb03f3b06f82a5434fa4dbcd26c4aaeb7f ChangeLog 2666
 MISC metadata.xml 222 RMD160 a74fc306077c440fea351793a03168651fb28f13 SHA1 45da96e6af3a3e7898ca55691d0e07583b6c75bf SHA256 5e7b34981ea08b001bd6eac085d6876fbeef6a4fdd91575e4e9f988cadf4f03f
 MD5 b86e3c93f969dbb4f433611cb0f6b0b0 metadata.xml 222
 RMD160 a74fc306077c440fea351793a03168651fb28f13 metadata.xml 222
@@ -47,7 +47,7 @@ SHA256 79ec82c9c39e4a5050b2167c57df3360dd2ce8108230df591025f2974c981300 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFE1QmhamhnQswr0vIRAgblAJ9614V2XP2Xr5zKpNEVuA3GQJSJEgCgsS1F
-ZwIGUa7R2KcfgkpQrH1tsSE=
-=vjRU
+iD8DBQFE1UUiZfNLSOUrp0sRAighAJ4gAXS1ZKxNRweOw32XDJ9QfqTpuQCgw3Wj
+36zKwEPYAi3ZWm8Adz6V/IA=
+=hwPv
 -----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 a8199361886a..09993321a4dc 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.10 2006/08/05 21:11:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.1.4-r1.ebuild,v 1.11 2006/08/06 01:25:54 kevquinn Exp $
 
 inherit fixheadtails eutils multilib autotools
 
@@ -31,10 +31,9 @@ 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/
+	# Recalculate the mkinstalldirs stuff (see bug #142565)
+	autopoint -f || die "Failed to auto-po-int"
+	# Set AT_M4DIR to workaround eautoreconf limitation (see bug #142565)
 	export AT_M4DIR="${S}/m4"
 	# Makefile.am modified, libtool added, hence autoreconf
 	WANT_AUTOMAKE="1.9" eautoreconf