remove zlib from libpython dependency (#90545)

Package-Manager: portage-2.0.51.22-r1

3 files changed, 31 insertions, 17 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 555b72aaaa83..29c79ba20d84 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/python
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.146 2005/05/28 00:55:06 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.147 2005/05/29 09:19:44 liquidx Exp $
+
+  29 May 2005; Alastair Tse <liquidx@gentoo.org>
+  files/python-2.4.1-libdir.patch:
+  remove zlib from libpython dependency (#90545)
 
   28 May 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.1.3-r1.ebuild,
   python-2.2.3-r6.ebuild, python-2.3.4-r1.ebuild, python-2.3.5.ebuild,
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index c4ce9be2114f..b0e6d5a65e40 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,17 +1,20 @@
-MD5 626c3490652d3feb9aa87a2fc507dd41 ChangeLog 24729
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6fd6b2bd29ba449fd503c0d9687be944 ChangeLog 24864
 MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
 MD5 2632d539cd0ab18b40f9510118ed3099 python-2.1.3-r1.ebuild 2299
-MD5 c90f0313a51cf5c1d36ba7093de86843 python-2.4.1.ebuild 7954
 MD5 5857a314767fd0ae2243590999fe78b2 python-2.2.3-r6.ebuild 4491
-MD5 49b7c74ebfd96db8408a53abbbcc6416 python-2.3.5.ebuild 7735
 MD5 b1e3772d6a5938465bd4207544d0251d python-2.3.4-r1.ebuild 7192
+MD5 49b7c74ebfd96db8408a53abbbcc6416 python-2.3.5.ebuild 7735
 MD5 c5a3ab318dc72805f5bb8935525b00a9 python-2.4-r3.ebuild 7108
+MD5 c90f0313a51cf5c1d36ba7093de86843 python-2.4.1.ebuild 7954
 MD5 1c5cd53cb89c821a549968bac31df0f1 files/depreorder.py 2235
 MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62
+MD5 fccf57b8c47164b676517e516898dc46 files/digest-python-2.4-r3 64
+MD5 6eab04aaa6abe2b795e4e5f4983bea38 files/python-2.4-readline.patch 9099
 MD5 1e4084c2a8ee240668d02e703e7c171f files/digest-python-2.4.1 66
-MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.3-mimetypes_apache.patch 454
-MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r6 62
-MD5 7a12ce3bbe0961cf1533fcf838e17fa9 files/python-2.3-db4.2.patch 1015
+MD5 eaa33949f072a9787c453c37c1236108 files/python-2.4.1-db4.patch 1414
 MD5 5f2361b3e770981b737a9ad3d2863931 files/python-2.2.1-r5-gentoo.diff 4152
 MD5 11aa066154fe2e0a4c306124c7e5dd4a files/python-2.2.2-tk-8.4.x.patch 2997
 MD5 96d4207fb41391c70d5f02e1785c9527 files/python-2.2.3-db4.patch 1220
@@ -19,16 +22,17 @@ MD5 7480e63a1ff3aff7eaf8718424add7f8 files/python-2.2.3-disable_modules_and_ssl.
 MD5 9fe31aedbbc7e8ea1847ed6dd70bf15b files/python-2.2.3-fPIC.patch 767
 MD5 07398060a831f18193315973df204cbf files/python-2.2.3-gentoo_py_dontcompile.patch 732
 MD5 46588eb4b2cfdd8277153e8e6f728eca files/python-2.3-add_portage_search_path.patch 607
+MD5 4b9922f74b1076d82d1fdb653fa5769a files/python-2.3-add_portage_search_path_take_2.patch 614
+MD5 7a12ce3bbe0961cf1533fcf838e17fa9 files/python-2.3-db4.2.patch 1015
 MD5 7808762bbf53647c7cd597be4044e9f7 files/python-2.3-gentoo_py_dontcompile.patch 478
+MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.3-mimetypes_apache.patch 454
+MD5 2b953054102d344834597bc73b209e12 files/python-2.3.2-disable_modules_and_ssl.patch 1285
+MD5 a387f41bfc6767b90a51daaa0c0aac45 files/python-2.3.4-lib64.patch 11779
 MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2 178
 MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.1 178
 MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.2 178
 MD5 201acd1cfd5124f25c58a8db3f78a502 files/python-config-2.3 178
 MD5 1cf4c21ad3b0aafc571b05b9a9e54594 files/python-updater 8761
-MD5 2b953054102d344834597bc73b209e12 files/python-2.3.2-disable_modules_and_ssl.patch 1285
-MD5 4b9922f74b1076d82d1fdb653fa5769a files/python-2.3-add_portage_search_path_take_2.patch 614
-MD5 c2e3a6ed5d700a7976f5b763cd935599 files/digest-python-2.3.4-r1 66
-MD5 a387f41bfc6767b90a51daaa0c0aac45 files/python-2.3.4-lib64.patch 11779
 MD5 5bee9fa15d4effc7423e76d2f7f47655 files/python-2.4-add_portage_search_path.patch 556
 MD5 7a12ce3bbe0961cf1533fcf838e17fa9 files/python-2.4-db4.2.patch 1015
 MD5 2b953054102d344834597bc73b209e12 files/python-2.4-disable_modules_and_ssl.patch 1285
@@ -36,14 +40,20 @@ MD5 2121d3986faa4b6c2c3ed472f77f2a9d files/python-2.4-gentoo_py_dontcompile.patc
 MD5 7ed8f8f52ed392ef28dd320b130e3c6b files/python-2.4-lib64.patch 9941
 MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.4-mimetypes_apache.patch 454
 MD5 d74e7f0fd47f00e8b3fe7ca36b7eb629 files/python-config-2.4 179
+MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r6 62
+MD5 849ff6337b70ef28009c90021dfae0da files/digest-python-2.3.5 66
 MD5 55af7ba61954f03e09bcafbce1227c61 files/python-2.2.3-xmlrpc.patch 3659
 MD5 e8c8ffd37f007b6ee62180d31b2100fe files/python-2.3-xmlrpc.patch 4228
 MD5 3c77f8f9d55bbedacd9476a428088250 files/python-2.4-libdir.patch 8358
 MD5 e8c8ffd37f007b6ee62180d31b2100fe files/python-2.4-xmlrpc.patch 4228
-MD5 849ff6337b70ef28009c90021dfae0da files/digest-python-2.3.5 66
-MD5 fccf57b8c47164b676517e516898dc46 files/digest-python-2.4-r3 64
+MD5 c2e3a6ed5d700a7976f5b763cd935599 files/digest-python-2.3.4-r1 66
 MD5 e9cc1b9be363e6c3f8df75cdb2ea9621 files/python-2.3-readline.patch 9596
-MD5 6eab04aaa6abe2b795e4e5f4983bea38 files/python-2.4-readline.patch 9099
-MD5 eaa33949f072a9787c453c37c1236108 files/python-2.4.1-db4.patch 1414
-MD5 30646e9931667060229fcf9685050ff4 files/python-2.4.1-libdir.patch 7910
 MD5 47e9455f3e16c3369c9e57388ba3d643 files/python-2.4.1-readline.patch 8984
+MD5 de3ef5603912c494d379eec843c8a674 files/python-2.4.1-libdir.patch 7911
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCmYmLTM53OX+9xmMRAoeGAKC10qaUxvgMFeYLjo/jPC4flWX0vgCfVxeU
+PRK7kb+n7zB3tzKqtALVGWU=
+=pduB
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/python/files/python-2.4.1-libdir.patch b/dev-lang/python/files/python-2.4.1-libdir.patch
index 4a11d1e8514b..434c6aed2711 100644
--- a/dev-lang/python/files/python-2.4.1-libdir.patch
+++ b/dev-lang/python/files/python-2.4.1-libdir.patch
@@ -96,7 +96,7 @@ diff -Naurp Python-2.4.orig/Modules/Setup.dist Python-2.4/Modules/Setup.dist
  # This require zlib 1.1.3 (or later).
  # See http://www.gzip.org/zlib/
 -#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
-+zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/@@GENTOO_LIBDIR@@ -lz
++#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/@@GENTOO_LIBDIR@@ -lz
  
  # Interface to the Expat XML parser
  #