Fix for latest autoconf (#254348)

Package-Manager: portage-2.2_rc23/cvs/Linux i686

4 files changed, 30 insertions, 9 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 257d4140a4bb..65471ff4f81b 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/zsh
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.135 2009/01/04 15:43:20 tove Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.136 2009/01/21 11:20:25 tove Exp $
+
+  21 Jan 2009; Torsten Veller <tove@gentoo.org>
+  +files/zsh-4.3.4-mkmakemod.patch, zsh-4.3.4-r1.ebuild:
+  Fix for latest autoconf (#254348)
 
 *zsh-4.3.9 (04 Jan 2009)
 
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 0d3bfe35badf..1be9f96d30f7 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -5,6 +5,7 @@ AUX prompt_gentoo_setup 1222 RMD160 883f6a906300a4d8300145f722769db57c90ece2 SHA
 AUX prompt_gentoo_setup-1 745 RMD160 7235736c59ee02ea2c6cdc3c31f2af788d3ed34d SHA1 f740b6c37c55affabe3a66f1ceb45b2a1484f28f SHA256 c04da5152712fcd2eb2b83a1967f892f31cc087e1245b28e4806ab5099ac16e7
 AUX zprofile 1343 RMD160 44038b7db235cbcc548ab6742c435f1c36868703 SHA1 8696a4afcb3116073da727bef10a826bf9f145e8 SHA256 f4a7067d695605520e18d41f619f6dfab4fcf2c71ad366930241266eb18900a6
 AUX zsh-4.3.4-configure-changequote.patch 694 RMD160 9f56120b2f8cc7ca913518ed099167fba3bc0b7f SHA1 986a8b03bc49da157ced270321538a579a9b6ec0 SHA256 78047e66ce905a701464616d3e3cc2a3a9714ac88ad063b6330234c5ea61e9e6
+AUX zsh-4.3.4-mkmakemod.patch 489 RMD160 156f0e94594198d83861414d4f0618f9fccf99aa SHA1 528994f7bc6dcb6b5b85b46997d97472d7166bd5 SHA256 094540885617e97afd947fede7935b0d9c18e375ddd471b729f752c11a4d32d9
 AUX zsh-init.d-gentoo.diff 1389 RMD160 1c317d93058b05e1d89dd81b4ab746ef31b4c38a SHA1 eb91fb330c0df1e227ee541159c7ac2d2fe15e53 SHA256 a8dcd168ab909a2b80b2958e3fc3cc974bc6048c08499be16c7925c1723b212f
 DIST zsh-4.3.4-doc.tar.bz2 2358063 RMD160 768ce8ca2860139428d27a0fedf5c0724967e444 SHA1 83d1a38112f305892393cb036058248ebbf6168e SHA256 e74289f99479328b8bcee9c47ae07038e54437e860fb5487da57cfc8d1836777
 DIST zsh-4.3.4-zshcalsys.tar.bz2 9346 RMD160 d26b370853419494725a73524ba81c754d63a201 SHA1 d93379f8dc81dcd63737519374e7d7d1ffb3cd87 SHA256 4225eb85ead732423405b567c879280780073a39fff3a05c6b6b13f29f0a382e
@@ -16,16 +17,16 @@ DIST zsh-4.3.6.tar.bz2 2527972 RMD160 fedd72f427439e75b8488479a3d20e9d8d5be794 S
 DIST zsh-4.3.9-doc.tar.bz2 2570995 RMD160 c7080f41901bd4b6d0b8e9f9385fd57a9d73a383 SHA1 456a696de365066b32161d194de9c7643dbeb7a0 SHA256 15ae762a228c2b2d410cecdddca279e49dfa6cfff85aaf8fa55e74940b4e8165
 DIST zsh-4.3.9.tar.bz2 2659602 RMD160 2c88347fa357e3624f000721963749c6ccb4e129 SHA1 7c80e1ad6b311ee5877172a1a7e0161a9a60da70 SHA256 8fdd6d6c6dc3a061b0c9a1b26eb367d10c0d8094d4b8bd2613740fc40b4382ab
 DIST zsh-lovers_0.5.orig.tar.gz 499014 RMD160 505261d9e28554c838864421ec81b6665e55dfa1 SHA1 bc9b41dd5814f60b39d393ef68c4dc099da9016b SHA256 d945adab65fdf3ff322ed64c54739b2a1cec964544c5f438005ddad9c0c62bea
-EBUILD zsh-4.3.4-r1.ebuild 4894 RMD160 9161bad9d8cbf2fe1e77a13fc617ab5c02c35a40 SHA1 fbf2d12b10a0ca04099fcbf6b5709c34f77c38fe SHA256 818ef15d7c1cbb30a306bfd4a24ef855225a62221c6a7701491737ed0f5c3ff5
+EBUILD zsh-4.3.4-r1.ebuild 4937 RMD160 eae72421392ddec85165875da2ae86ce9f47dc4d SHA1 93e289f637ace754e11b63a1c7d584a6014a7338 SHA256 86489b1dd6aefe9e84379f1e4f9b378cd2e4e8114c60a0cfbad66e93ab4d56e8
 EBUILD zsh-4.3.5.ebuild 3967 RMD160 80ff8f3d833bf79f92b574f984f46e1b0b911a05 SHA1 144f8ebd1a4f844aa3a5e807501f9f589181e10f SHA256 ba0cb5a089909a0178dbae67cf5975a822e1c0f039b2dc532f6787f2324b26a9
 EBUILD zsh-4.3.6.ebuild 4597 RMD160 60ec0dfa7339d56ab52da03c950acd6f4046a72d SHA1 b3662be5429293fb0af800de54e561ad0e83f334 SHA256 27c233d2f6e10fbfb45429b012e90ab3b3da2ea7811269c1e46a5117f335b2b8
 EBUILD zsh-4.3.9.ebuild 4856 RMD160 415aa4a7931dbd9c33ff8748c2ac154517713d60 SHA1 003bee4f0ea0ae7b076ae1000c5e4e236188f4c2 SHA256 858ba975af8ed92127cc79aab010e84660d8e5a3ec319c49c7ad141545b2faa9
-MISC ChangeLog 20721 RMD160 c43ee0a7683680102d409f7dc5a8ba21734d8dd5 SHA1 d0a84772bac150c9d4c3e9691558856649f50627 SHA256 41b8594011e13fffc21e6ef5469600709e8bc8df95f22f742eecf20ea10fba95
+MISC ChangeLog 20863 RMD160 5ddfca7343ea28ba0d1e0cc6147e67cded163801 SHA1 5af39c93ba320c1a6b1fb16fc991b61930b29e0a SHA256 003ee8a806223f6062372729b91591bf2c065c95175663a8134658a511a3016c
 MISC metadata.xml 553 RMD160 b4d3d1ca445d0c50f0372fb8af1e9fa2e4c303fb SHA1 8652a4d38b0858eff280576ca143ddc9b5db83c1 SHA256 e4bdebdc75f06d8cc998456bd2a1ec7300b6a08ca5fb28590841ad7071366cf4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklg2QUACgkQV3J2n04EauwKMgCfVGA/98tpZ+XZgT7z4l5HH8xZ
-gdIAn2gPlYw5u/x2/MiToyVUJf22VWGo
-=qLM+
+iEYEARECAAYFAkl3BOcACgkQV3J2n04EauyeSgCeI5W2EjtVCvWlbK+m1bkbbf3k
+Pw8AoJ8ZWvoeXOwBvffI+HOStFD+58vL
+=AK3d
 -----END PGP SIGNATURE-----
diff --git a/app-shells/zsh/files/zsh-4.3.4-mkmakemod.patch b/app-shells/zsh/files/zsh-4.3.4-mkmakemod.patch
new file mode 100644
index 000000000000..f8dea0397a9b
--- /dev/null
+++ b/app-shells/zsh/files/zsh-4.3.4-mkmakemod.patch
@@ -0,0 +1,15 @@
+bug #254348
+--- a/Src/mkmakemod.sh
++++ b/Src/mkmakemod.sh
+@@ -111,10 +111,7 @@
+     sed -e '/^#/d' -e 's/ .*/ /' -e 's/^name=/ /'`"
+     module_list="${bin_mods}${dyn_mods}"
+ 
+-    # check 2.13, 2.50, and 2.60 syntaxes
+-    if grep '%@D@%D%' config.status >/dev/null ||
+-       grep ',@D@,D,' config.status >/dev/null ||
+-       grep ',@D@,|#_!!_#|D,' config.status >/dev/null; then
++    if grep '^#define DYNAMIC ' config.h >/dev/null; then
+ 	is_dynamic=true
+     else
+ 	is_dynamic=false
diff --git a/app-shells/zsh/zsh-4.3.4-r1.ebuild b/app-shells/zsh/zsh-4.3.4-r1.ebuild
index 024e423b7016..3da981cfc94d 100644
--- a/app-shells/zsh/zsh-4.3.4-r1.ebuild
+++ b/app-shells/zsh/zsh-4.3.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.4-r1.ebuild,v 1.10 2008/06/29 10:46:16 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.4-r1.ebuild,v 1.11 2009/01/21 11:20:25 tove Exp $
 
 inherit eutils multilib autotools
 
@@ -41,6 +41,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${PN}"-init.d-gentoo.diff
 	epatch "${FILESDIR}/${P}"-configure-changequote.patch
+	epatch "${FILESDIR}/${P}"-mkmakemod.patch
 	eautoreconf
 }