Removing sed that tried to force static linking with libpcre and closing bug #182534.

Package-Manager: portage-2.1.3.16

4 files changed, 35 insertions, 20 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 0c298d8982cf..b177a4818a82 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/zsh
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.114 2007/08/16 09:52:54 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.115 2007/11/06 00:39:19 wolf31o2 Exp $
+
+  06 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org> zsh-4.3.2-r2.ebuild,
+  zsh-4.3.4.ebuild:
+  Removing sed that tried to force static linking with libpcre and closing bug
+  #182534.
 
   16 Aug 2007; Roy Marples <uberlord@gentoo.org>
   +files/zsh-4.3.4-configure-changequote.patch, zsh-4.3.4.ebuild:
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 3f97749cb01c..ab4aa6c10dc5 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX prompt_gentoo_setup 1222 RMD160 883f6a906300a4d8300145f722769db57c90ece2 SHA1 1441a7533c4197e1ddd467dc102a35be4659ff9c SHA256 59689d972abbe60dcfa567193060ec11d076a60accadf1015fa9ae59ad864667
 MD5 ab8716ecc62780da37e48f910bd34ed0 files/prompt_gentoo_setup 1222
 RMD160 883f6a906300a4d8300145f722769db57c90ece2 files/prompt_gentoo_setup 1222
@@ -40,18 +43,18 @@ EBUILD zsh-4.2.6-r1.ebuild 4224 RMD160 f76f5e00fb642f745a1a1787abc28e6d6d033e07
 MD5 7aebaab091bb6b76be4b469d5dd416ca zsh-4.2.6-r1.ebuild 4224
 RMD160 f76f5e00fb642f745a1a1787abc28e6d6d033e07 zsh-4.2.6-r1.ebuild 4224
 SHA256 cb0da4ee87340dd63a9c125cea46d06b8c4b61684f7473ebaccc3cef793552b2 zsh-4.2.6-r1.ebuild 4224
-EBUILD zsh-4.3.2-r2.ebuild 4646 RMD160 0ee5af1eec20f48f92a3285cebd21242733388c7 SHA1 aeb5c5cbd53e1ca5ba7a86966a94e4a5105f2741 SHA256 99a4b2c157c3bfd0d0a615b05a958d479960c4859d87ea189081ce1fd5367460
-MD5 e06904d7ba943fd1bd118e4ab1792e21 zsh-4.3.2-r2.ebuild 4646
-RMD160 0ee5af1eec20f48f92a3285cebd21242733388c7 zsh-4.3.2-r2.ebuild 4646
-SHA256 99a4b2c157c3bfd0d0a615b05a958d479960c4859d87ea189081ce1fd5367460 zsh-4.3.2-r2.ebuild 4646
-EBUILD zsh-4.3.4.ebuild 4624 RMD160 157f2a1e8cf253d8557db9af09ab53e05d0240a9 SHA1 71f23aea3eb48004b117b284d73f0222b930d56a SHA256 a19109b15fbf72f15e13a238922c34771bb04408825e83226f53877536309713
-MD5 7cead91052db2d137c86bec4699698cd zsh-4.3.4.ebuild 4624
-RMD160 157f2a1e8cf253d8557db9af09ab53e05d0240a9 zsh-4.3.4.ebuild 4624
-SHA256 a19109b15fbf72f15e13a238922c34771bb04408825e83226f53877536309713 zsh-4.3.4.ebuild 4624
-MISC ChangeLog 17886 RMD160 19bf56e4b7c73ae2620285b5dc484dd236f038ee SHA1 aaef14f5bf0c708f378139dc1bb982757a070e68 SHA256 3f6525bbabb39a048c802d77e2d8f6ac7761c550fda9d774e0523cc8facb62ff
-MD5 5436649f179c55691f3cae0595fba1b7 ChangeLog 17886
-RMD160 19bf56e4b7c73ae2620285b5dc484dd236f038ee ChangeLog 17886
-SHA256 3f6525bbabb39a048c802d77e2d8f6ac7761c550fda9d774e0523cc8facb62ff ChangeLog 17886
+EBUILD zsh-4.3.2-r2.ebuild 4650 RMD160 e14a6f69231fa4bb4da2cc51159f077e1f4186ea SHA1 23031c63ffbe9519494331c1248d3fd16ba06acb SHA256 0e897be8d86d06d087cb792dea0e6babf65b9d446e372bf28c157224195dd2ca
+MD5 bf10bc01eaf1cafe5b84e91e74403799 zsh-4.3.2-r2.ebuild 4650
+RMD160 e14a6f69231fa4bb4da2cc51159f077e1f4186ea zsh-4.3.2-r2.ebuild 4650
+SHA256 0e897be8d86d06d087cb792dea0e6babf65b9d446e372bf28c157224195dd2ca zsh-4.3.2-r2.ebuild 4650
+EBUILD zsh-4.3.4.ebuild 4626 RMD160 2879df6fe586769857fbc24985d02e25256d170a SHA1 52e0ec63c20af022cec2993b69b6aedf177fdb6d SHA256 8e1978bbe5fa28a96b785b8a305ba481c9f1d9bd950351f2317918b45ec4f267
+MD5 898578c9b6e28d483d7ea334c05bdd30 zsh-4.3.4.ebuild 4626
+RMD160 2879df6fe586769857fbc24985d02e25256d170a zsh-4.3.4.ebuild 4626
+SHA256 8e1978bbe5fa28a96b785b8a305ba481c9f1d9bd950351f2317918b45ec4f267 zsh-4.3.4.ebuild 4626
+MISC ChangeLog 18072 RMD160 debc421f2b0a41a69a6335960eaa89dabb137cfc SHA1 9225554c2d8cb08a67d6c4e6bae10f5b46a7d861 SHA256 0c4ce0723525e0c671ef6311e139f71208766e261f41a362baea47f4faf21bb5
+MD5 c240742cfec55d66c1e21d07bd43abce ChangeLog 18072
+RMD160 debc421f2b0a41a69a6335960eaa89dabb137cfc ChangeLog 18072
+SHA256 0c4ce0723525e0c671ef6311e139f71208766e261f41a362baea47f4faf21bb5 ChangeLog 18072
 MISC metadata.xml 506 RMD160 2bb66fd9797dfb0000540f70ba3ae0b0d7e7ebe0 SHA1 ffc2013388ceb5abe378ec9668e33b692d568c45 SHA256 32679041c8a9f3c0d25ecee624fa8642ab0d99e65e93e728caa856973ec18729
 MD5 28ed8ea6cdccb353e2e8ad783eb51f5b metadata.xml 506
 RMD160 2bb66fd9797dfb0000540f70ba3ae0b0d7e7ebe0 metadata.xml 506
@@ -68,3 +71,10 @@ SHA256 c5cf1890cb7526846f2b71a94bc35527b2939b315171cfa9a843c57b7ca04919 files/di
 MD5 8fc96cd01cb7172ac09b55f88eedde46 files/digest-zsh-4.3.4 674
 RMD160 2a667e8798c476a55c79dac282b26a96fa92033d files/digest-zsh-4.3.4 674
 SHA256 9c8839c9244f79ba4e6c8985fe2f89a66d16bf67314f20b3ea7a9a12d0275945 files/digest-zsh-4.3.4 674
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHL7e5kT4lNIS36YERAgd+AJ9ZsBuqJNgb7Wdvs5okqF2Q9Wky9ACfX3xI
+V6cxoiTjUpXmrfv3OwfMFVI=
+=X0k0
+-----END PGP SIGNATURE-----
diff --git a/app-shells/zsh/zsh-4.3.2-r2.ebuild b/app-shells/zsh/zsh-4.3.2-r2.ebuild
index 677c2fd26bbc..c42b62f7c70d 100644
--- a/app-shells/zsh/zsh-4.3.2-r2.ebuild
+++ b/app-shells/zsh/zsh-4.3.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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-r2.ebuild,v 1.12 2007/06/14 18:16:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.2-r2.ebuild,v 1.13 2007/11/06 00:39:19 wolf31o2 Exp $
 
 inherit eutils multilib
 
@@ -69,10 +69,10 @@ src_compile() {
 		sed -i -e "s/link=no/link=static/g" \
 			-e "s/load=no/load=yes/g" \
 			config.modules || die
-	else
+#	else
 		# avoid linking to libs in /usr/lib, see Bug #27064
-		sed -i -e "/LIBS/s%-lpcre%/usr/$(get_libdir)/libpcre.a%" \
-			Makefile || die
+#		sed -i -e "/LIBS/s%-lpcre%/usr/$(get_libdir)/libpcre.a%" \
+#			Makefile || die
 	fi
 
 	# emake still b0rks
diff --git a/app-shells/zsh/zsh-4.3.4.ebuild b/app-shells/zsh/zsh-4.3.4.ebuild
index ebc9671458a2..b1c5ea61c267 100644
--- a/app-shells/zsh/zsh-4.3.4.ebuild
+++ b/app-shells/zsh/zsh-4.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.ebuild,v 1.3 2007/08/16 09:52:54 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.4.ebuild,v 1.4 2007/11/06 00:39:19 wolf31o2 Exp $
 
 inherit eutils multilib autotools
 
@@ -73,8 +73,8 @@ src_compile() {
 		sed -i -e "s/link=no/link=static/g" \
 			-e "s/load=no/load=yes/g" \
 			config.modules || die
-	else
-		sed -i -e "/LIBS/s%-lpcre%/usr/$(get_libdir)/libpcre.a%" Makefile
+#	else
+#		sed -i -e "/LIBS/s%-lpcre%/usr/$(get_libdir)/libpcre.a%" Makefile
 	fi
 
 	emake || die "make failed"