Fixed confusion that improper patching created

(Portage version: 2.0.54-r2)

7 files changed, 21 insertions, 25 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index de23bfcc8a13..fa35dfc1eb07 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/zsh
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.95 2006/05/25 17:40:49 merlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.96 2006/05/30 23:07:22 merlin Exp $
+
+*zsh-4.2.6-r1 (30 May 2006)
+
+  30 May 2006; Cory Visi <visi@gentoo.org> zsh-4.2.6-r1.ebuild,
+  zsh-4.3.2-r1.ebuild:
+  Fixed confusion that improper patching created
 
   25 May 2006; Cory Visi <visi@gentoo.org> zsh-4.2.6.ebuild, zsh-4.3.2.ebuild:
   Updated header and correct multilib build problems discussed in Bug 133539
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 8d85630b5a7f..86e033846a55 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,10 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 77d3caaa4a96ba65b8449e1f650b3df3 ChangeLog 14996
-MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r4 199
-MD5 9001ff5324448d902a296276500ac3fb files/digest-zsh-4.2.4 199
-MD5 1710d7b038f0aac2aca3520bb546659c files/digest-zsh-4.2.5 199
+MD5 ae284060d8b47afbd2cdae10358d5189 ChangeLog 15162
+MD5 5a1c6f322578120f1cdfcbe935753641 files/digest-zsh-4.0.9-r4 199
+MD5 b824db86f4faa040c73723f000a220fe files/digest-zsh-4.2.4 199
+MD5 77f1924526d9d12feba8ce108113192f files/digest-zsh-4.2.5 199
 MD5 6a0124cadb5fb33bee5400ae9acc74c0 files/digest-zsh-4.2.6 199
 MD5 0a98d1389721ff23a192e03df3825e70 files/digest-zsh-4.2.6-r1 199
 MD5 da3a0178918bcb34c920992cd720b743 files/digest-zsh-4.3.2 130
@@ -19,14 +16,7 @@ MD5 28ed8ea6cdccb353e2e8ad783eb51f5b metadata.xml 506
 MD5 d5f3557fedf35ebc49211049d7b3b641 zsh-4.0.9-r4.ebuild 2889
 MD5 6759a1e89716a3959efa0101fac89c74 zsh-4.2.4.ebuild 4308
 MD5 15f3385fc425d0200754f217be128a24 zsh-4.2.5.ebuild 4542
-MD5 2099038cbaa05af96adf1cbeaf123b73 zsh-4.2.6-r1.ebuild 4328
+MD5 8ff782cacfb457625c0ef3dcd94d64d2 zsh-4.2.6-r1.ebuild 4338
 MD5 1e9e170f3700df829209f023474a13f2 zsh-4.2.6.ebuild 4335
-MD5 08c69fb491b83da9add58099d5cbb4a8 zsh-4.3.2-r1.ebuild 4277
+MD5 78bbbb2226aa32d7261a65387c0eeabe zsh-4.3.2-r1.ebuild 4287
 MD5 0c33f6eca98cae88529ebc47bb3e2e35 zsh-4.3.2.ebuild 4284
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEdexWK3VlI3Kj19sRArH0AJ4pEzwpWq4kOI3ZEcQG0qVfkxsVdACfY4mr
-pUnUzNJrjTjJgHSHk1BYtzU=
-=hWgT
------END PGP SIGNATURE-----
diff --git a/app-shells/zsh/files/digest-zsh-4.0.9-r4 b/app-shells/zsh/files/digest-zsh-4.0.9-r4
index 19f27e152f5f..2353cfc13ec3 100644
--- a/app-shells/zsh/files/digest-zsh-4.0.9-r4
+++ b/app-shells/zsh/files/digest-zsh-4.0.9-r4
@@ -1,3 +1,3 @@
-MD5 26cc0f9051ba41063e950723246dfaa8 zsh-4.0.9.tar.bz2 1749802
 MD5 f7032dd0a992cba7bb903ab90a9ca667 zsh-4.0.9-doc.tar.bz2 1411985
 MD5 1e755a2ffa0bad11b0ebc7d5d7622674 zsh-4.0.9-euc-0.2.patch.gz 2869
+MD5 26cc0f9051ba41063e950723246dfaa8 zsh-4.0.9.tar.bz2 1749802
diff --git a/app-shells/zsh/files/digest-zsh-4.2.4 b/app-shells/zsh/files/digest-zsh-4.2.4
index e737c0b8c01a..9c1700536c83 100644
--- a/app-shells/zsh/files/digest-zsh-4.2.4
+++ b/app-shells/zsh/files/digest-zsh-4.2.4
@@ -1,3 +1,3 @@
-MD5 5c37fa9eb659458fe4f7f80da17fb09c zsh-4.2.4.tar.bz2 2089657
-MD5 8172d69a12886c85b0a4b579a695dffe zsh-4.2.4-euc-0.3.patch.gz 2942
 MD5 5ffbe07c766dae7708f3f0eb2c1a779f zsh-4.2.4-doc.tar.bz2 1766830
+MD5 8172d69a12886c85b0a4b579a695dffe zsh-4.2.4-euc-0.3.patch.gz 2942
+MD5 5c37fa9eb659458fe4f7f80da17fb09c zsh-4.2.4.tar.bz2 2089657
diff --git a/app-shells/zsh/files/digest-zsh-4.2.5 b/app-shells/zsh/files/digest-zsh-4.2.5
index 7b0af656621e..91408da0485d 100644
--- a/app-shells/zsh/files/digest-zsh-4.2.5
+++ b/app-shells/zsh/files/digest-zsh-4.2.5
@@ -1,3 +1,3 @@
-MD5 e2060f743dcdf3b383e80e862a6548fe zsh-4.2.5.tar.bz2 2074535
 MD5 8172d69a12886c85b0a4b579a695dffe zsh-4.2.4-euc-0.3.patch.gz 2942
 MD5 6dc896b52a3bc20a514148d621e13282 zsh-4.2.5-doc.tar.bz2 1768286
+MD5 e2060f743dcdf3b383e80e862a6548fe zsh-4.2.5.tar.bz2 2074535
diff --git a/app-shells/zsh/zsh-4.2.6-r1.ebuild b/app-shells/zsh/zsh-4.2.6-r1.ebuild
index d69d9572a5bb..82224b7588e5 100644
--- a/app-shells/zsh/zsh-4.2.6-r1.ebuild
+++ b/app-shells/zsh/zsh-4.2.6-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-shells/zsh/zsh-4.2.6-r1.ebuild,v 1.1 2006/05/25 17:40:49 merlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.6-r1.ebuild,v 1.2 2006/05/30 23:07:22 merlin Exp $
 
 inherit eutils multilib
 
@@ -73,7 +73,7 @@ src_compile() {
 			config.modules || die
 	else
 		# avoid linking to libs in /usr/lib, see Bug #27064
-		sed -i -e "/LIBS/s%-lpcre%/usr/lib/libpcre.a%" \
+		sed -i -e "/LIBS/s%-lpcre%/usr/$(get_libdir)/libpcre.a%" \
 			Makefile || die
 	fi
 
diff --git a/app-shells/zsh/zsh-4.3.2-r1.ebuild b/app-shells/zsh/zsh-4.3.2-r1.ebuild
index ff566fed78c1..6fb1622c662a 100644
--- a/app-shells/zsh/zsh-4.3.2-r1.ebuild
+++ b/app-shells/zsh/zsh-4.3.2-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-shells/zsh/zsh-4.3.2-r1.ebuild,v 1.1 2006/05/25 17:40:49 merlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.2-r1.ebuild,v 1.2 2006/05/30 23:07:22 merlin Exp $
 
 inherit eutils multilib
 
@@ -72,7 +72,7 @@ src_compile() {
 			config.modules || die
 	else
 		# avoid linking to libs in /usr/lib, see Bug #27064
-		sed -i -e "/LIBS/s%-lpcre%/usr/lib/libpcre.a%" \
+		sed -i -e "/LIBS/s%-lpcre%/usr/$(get_libdir)/libpcre.a%" \
 			Makefile || die
 	fi