Patch updated to make it compile on amd64 and with future boost-1.34, thanks to Chris Mayo for pointing it out.

Package-Manager: portage-2.1.2_pre2-r4

3 files changed, 19 insertions, 13 deletions

diff --git a/dev-python/pythonmagick/ChangeLog b/dev-python/pythonmagick/ChangeLog
index c341f492920b..8a1d2020b40c 100644
--- a/dev-python/pythonmagick/ChangeLog
+++ b/dev-python/pythonmagick/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pythonmagick
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/ChangeLog,v 1.5 2006/10/01 17:14:03 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/ChangeLog,v 1.6 2006/10/17 22:19:41 dev-zero Exp $
+
+  17 Oct 2006; Tiziano Müller <dev-zero@gentoo.org> ChangeLog:
+  Patch updated to make it compile on amd64 and with future boost-1.34,
+  thanks to Chris Mayo for pointing this out.
 
   01 Oct 2006; Tiziano Müller <dev-zero@gentoo.org> ChangeLog:
   Version bump.
diff --git a/dev-python/pythonmagick/Manifest b/dev-python/pythonmagick/Manifest
index a6e49d80a245..768367da3dca 100644
--- a/dev-python/pythonmagick/Manifest
+++ b/dev-python/pythonmagick/Manifest
@@ -10,10 +10,10 @@ AUX boost-build.jam 76 RMD160 f2e27a4d3a1608dc91a47ab4a2086bf90f7ecb6a SHA1 7d9a
 MD5 a4d7bf1371445f799f0be802d9b97ce1 files/boost-build.jam 76
 RMD160 f2e27a4d3a1608dc91a47ab4a2086bf90f7ecb6a files/boost-build.jam 76
 SHA256 3575e8b519cfdf70cdc6eb9c6baf49f6867a3b7cb5bc0994383740c8c69eeae7 files/boost-build.jam 76
-AUX pythonmagick-0.6-gentoo_misc_fixes.patch 674 RMD160 c304ca18965ea2e2c553a40d0b20ef28027debe0 SHA1 5339a2d3508caaafc50e531a1147bcb35b0d2aa9 SHA256 b704d373a9bc1561ae5bc212cad108e2a67b4d86c4835b0226912c1ae4a91e18
-MD5 e4b2b04607a7974028da785ee78b3ef2 files/pythonmagick-0.6-gentoo_misc_fixes.patch 674
-RMD160 c304ca18965ea2e2c553a40d0b20ef28027debe0 files/pythonmagick-0.6-gentoo_misc_fixes.patch 674
-SHA256 b704d373a9bc1561ae5bc212cad108e2a67b4d86c4835b0226912c1ae4a91e18 files/pythonmagick-0.6-gentoo_misc_fixes.patch 674
+AUX pythonmagick-0.6-gentoo_misc_fixes.patch 745 RMD160 56e53df20162729f38bb30c3ec69982a5816e14b SHA1 cc0d60de95e38776ce5bc5a5ba7d98294f5116ba SHA256 15d60ffa62c39b5677b441fe6e918f2a0f215ed999b2cfdb57143fa7e27a9d68
+MD5 fd847f7497e1bd3ef2c2cad931999979 files/pythonmagick-0.6-gentoo_misc_fixes.patch 745
+RMD160 56e53df20162729f38bb30c3ec69982a5816e14b files/pythonmagick-0.6-gentoo_misc_fixes.patch 745
+SHA256 15d60ffa62c39b5677b441fe6e918f2a0f215ed999b2cfdb57143fa7e27a9d68 files/pythonmagick-0.6-gentoo_misc_fixes.patch 745
 DIST PythonMagick-0.5.tar.gz 39466
 DIST PythonMagick-0.6.tar.gz 19258 RMD160 295b19ae7dd4c60292f7c9eeb39c6644035b9b8a SHA1 498e000d0e59fe7251b3660a130065e97cdf33fc SHA256 487a2253a6843d32023daa124b0e6e5f82d5ec0c8d5213214184066734073b72
 EBUILD pythonmagick-0.5-r1.ebuild 1198 RMD160 e6d28f6b253b6410ba1c743fc753f35947b8192b SHA1 a15d62849450b375eb90a085f838206d570726e7 SHA256 b76db394958aec4e3cbf3234660e1b17b76be581c3c4a2f0553b534099ce2310
@@ -24,10 +24,10 @@ EBUILD pythonmagick-0.6.ebuild 1345 RMD160 2724258f4b8b08cb78b79081393bc66a57532
 MD5 9350b49d057297cc9a10baa0f409c2c5 pythonmagick-0.6.ebuild 1345
 RMD160 2724258f4b8b08cb78b79081393bc66a57532f31 pythonmagick-0.6.ebuild 1345
 SHA256 e67361d11827568d292ada623921e32450c93abccc0762e3dcb993e29deac190 pythonmagick-0.6.ebuild 1345
-MISC ChangeLog 763 RMD160 f8e0a3c89d80a1030fd2ba192a6440f788fdd8f9 SHA1 86e3c1c9715110645004a82dd3e8129113384d6f SHA256 c964ccfb11f6496efa1c9840b26941f16d4bd899c0527118481620835c751119
-MD5 d299ece6602bd3c6430870a77e4227db ChangeLog 763
-RMD160 f8e0a3c89d80a1030fd2ba192a6440f788fdd8f9 ChangeLog 763
-SHA256 c964ccfb11f6496efa1c9840b26941f16d4bd899c0527118481620835c751119 ChangeLog 763
+MISC ChangeLog 946 RMD160 2d6120237922898daa24d98f7f8bb156e46907e0 SHA1 20605f03dbae81c63f2358aa983562fb69f9da2e SHA256 917c14cb979ec76eaec8bf5da6bd4f2b9a492571f016a971eeb88a69d385e8ae
+MD5 513777f26684baa67ff8f3231f7501ac ChangeLog 946
+RMD160 2d6120237922898daa24d98f7f8bb156e46907e0 ChangeLog 946
+SHA256 917c14cb979ec76eaec8bf5da6bd4f2b9a492571f016a971eeb88a69d385e8ae ChangeLog 946
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
diff --git a/dev-python/pythonmagick/files/pythonmagick-0.6-gentoo_misc_fixes.patch b/dev-python/pythonmagick/files/pythonmagick-0.6-gentoo_misc_fixes.patch
index a2d6a61939e2..945511019680 100644
--- a/dev-python/pythonmagick/files/pythonmagick-0.6-gentoo_misc_fixes.patch
+++ b/dev-python/pythonmagick/files/pythonmagick-0.6-gentoo_misc_fixes.patch
@@ -1,10 +1,12 @@
---- SConstruct.orig	2006-10-01 13:36:15.000000000 +0200
-+++ SConstruct	2006-10-01 13:37:02.000000000 +0200
-@@ -21,15 +21,16 @@
+--- SConstruct.orig	2006-10-18 00:57:28.000000000 +0200
++++ SConstruct	2006-10-18 00:58:26.000000000 +0200
+@@ -20,16 +20,17 @@
+     IM_LIB_PATH='/usr/lib/'
      GD_LIBS=['Magick','Magick++','Wand']
      PYTHON_INCLUDE='/usr/include/python2.4'
-     BOOST_PYTHON_LIB=['libboost_python-gcc']
+-    BOOST_PYTHON_LIB=['libboost_python-gcc']
 -    CPP_FLAGS=['-DBOOST_PYTHON_STATIC_LIB','-O2']
++    BOOST_PYTHON_LIB=['libboost_python']
 +    CPP_FLAGS=['-DBOOST_PYTHON_STATIC_LIB']
  
  #   setup the environment