Patched to fix build issue, fixes Byg #500414 by megabaks, patch by M. von Gagern

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 37 insertions, 6 deletions

diff --git a/dev-python/pythonmagick/ChangeLog b/dev-python/pythonmagick/ChangeLog
index 834ab6c052f0..01ba21a28b24 100644
--- a/dev-python/pythonmagick/ChangeLog
+++ b/dev-python/pythonmagick/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pythonmagick
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/ChangeLog,v 1.43 2013/04/23 05:35:51 patrick Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/ChangeLog,v 1.44 2014/03/25 11:31:54 idella4 Exp $
+
+  25 Mar 2014; Ian Delaney <idella4@gentoo.org>
+  +files/pythonmagick-0.9.8-build.patch, pythonmagick-0.9.8.ebuild:
+  Patched to fix build issue, fixes Byg #500414 by megabaks, patch by M. von
+  Gagern
 
   23 Apr 2013; Patrick Lauer <patrick@gentoo.org> pythonmagick-0.9.8.ebuild:
   Better fix for automake dependency
diff --git a/dev-python/pythonmagick/Manifest b/dev-python/pythonmagick/Manifest
index 9d6c164b7f5c..6f262c79f8de 100644
--- a/dev-python/pythonmagick/Manifest
+++ b/dev-python/pythonmagick/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX pythonmagick-0.9.1-use_active_python_version.patch 1101 SHA256 6b232316ee18b1bdb40f1eef8768c51485bb179af1d640b3cacc03745a638731 SHA512 64e3cb6f731f673c5f1c56bb5fd5aa953a3d31acd6e13ff4f782c10e9def317a358463d1291c982a5772692b7f3e1286145bf4aea3be6ed625790aa88a9c917a WHIRLPOOL e05396fdb4138d83cf30a85817cfc871e440ec47b6bdfe8082e25e62133e50cd1f4e407f385ce8869d4ba34a8e05b42a30b820a285f2261f1c69629ef2d1ae87
 AUX pythonmagick-0.9.2-fix_detection_of_python_includedir.patch 645 SHA256 1b4e7d06d7270c111589d18ad6ba5ee90e182b7bd4d1bf490c5ba49d4144bfda SHA512 5aa2c52821104df8da703dcb08272777e1c8248f0d6feb452931c7b820452bf4dc3aabafc666f352f23f62892aef26e60bda515acd0906f011210bb947f9cea5 WHIRLPOOL 646e086684eb5e2077cad2de088b6f35f231bf4cdded98b10bed492478c4288731f8445e4e2ee23a06de350ddadc2dc3e84102d4afc60f50a5ec273ae86968af
+AUX pythonmagick-0.9.8-build.patch 1386 SHA256 f42eae078c328f380ca8fa8f8ec0ce5c215ac2083619fee434b07267167252fd SHA512 c7a6f4aa4984e5ed57c426696f7d58f0464b805f6a0ae127862d3f20da06a7cdccd7beea3e572f16f35d0829e1a0693cc50768d8df6ee35240bd2f032610b798 WHIRLPOOL 1601a96fb50c8182ebf48d22a07684cb280a5eebc4f8844967d3a77600c42a09b5c826f2d5a8bd60cae88ebf371be36fd5b3cc5bf25649098794a440f1b21fdc
 DIST PythonMagick-0.9.7.tar.xz 247772 SHA256 8c5fbd7030f52aca0e2f11e2d61c8040c8758975987033ee121473bfbee694f5 SHA512 cb69e10eb57bd38a7fac0c002b37fbd0d8f31da8db02a2413ac01b969b68b25227cb924c28ef9683dbb5c9a149ad779acb51af098682c6d537f4690753dc5b22 WHIRLPOOL a263295e493a6592439ffe5caa77afc5f362cea5506d4196cde103df66208f60ec444c7451fee0b9ad077eb0d361388d66b6b6c0d6fb290efa99cec412a8e3fe
 DIST PythonMagick-0.9.8.tar.xz 250200 SHA256 3e0d99128b0eec20c85a73308799b64a71fe28f443b7e9a3304a2c55c0ccf2be SHA512 b373310920dc7f14d410abc97fc3acca0e0a6919adcb25744b611933128eef9bf5868692cbae3d5a67919667d74c105faaa0771d785d6c5108f3d9663af6761a WHIRLPOOL 730c099af4fc7c21c5e254fc7dbdfb005755dd0a22ffeb57d7dbcb75af0d88efac2c44954ca72017091160a669cd521477239215c9f21cccee6861d9fd7f636e
 EBUILD pythonmagick-0.9.7-r1.ebuild 1732 SHA256 9c1457d09976650cf98287452b960ab94732bcd8f65990fee1a36f24f42a3474 SHA512 691074725a6bde2cdd2b2d65fbdd6bedf2958501f97c51447f5fcc93cebf404e30cbee15253eb8a845d867617189acb80f00ca609cad49535184264d589ecbe1 WHIRLPOOL 5b955c1b1c2eaed0eaf64d69226b41fa4185272b59b0f479305e3d438dbe7c33058f4f5df54bf7fd77fce9efeffbc23ff249aad7477d04b3b57955e9be51e16d
-EBUILD pythonmagick-0.9.8.ebuild 1617 SHA256 82a8ff402111bf0f3be1b8e6db259da8fd2c74fc9281ade14cc6a5e5c3061a59 SHA512 4209e73d952685fd6eaecc1fe30856c67df01f6beaa04ccff83bb969b2403517160d424edece82e898fbb8f63576d6bcf46cb6f1e81f69c0c10946974b00f86d WHIRLPOOL c9fa3cf72bcaa275f8f14662762aaf5383156fbef1aaa99a8fc11e3c329bb74d6225350b7e3307f777c852617095d70d4ef3f2941efff564189dd86ef74dede7
-MISC ChangeLog 7154 SHA256 10d44663ab87806302dfbd30b9fa5324ac428f2b3bce813819f47f77e68f9eb8 SHA512 052b463525d0b5748e58078faed9bc22b8d8825dc228f10bb330205992c9d7a3f22925db2f047e093f44dcb42480f2d71a296d969a23bbbe85ff984561a4d547 WHIRLPOOL 9381fb5374e91e53f0de9df89f48bd00f1fb1f8ac63150b7f1dfa3f9aeba7bb1ad80f9dc39ec580af6f5822133d8877445260c003977373877f84c82d4a6b6e5
+EBUILD pythonmagick-0.9.8.ebuild 1656 SHA256 15c5db14da3744d2f5f68ba746bea54367f68cf2e8a7680a8cab06ecd2b2aaf7 SHA512 647023fff3383ed25fca8863859bd69d55746a0040b603be594caf18344c8964bdd9f749a1313a26fab321babeb063c460435e9a2954b87f1e92336cb81cf781 WHIRLPOOL fce70f3cae5411bb1c912635b7d7c9d0f528f8c9114dde65ceceb6dba162f5eca35ebc3cdb7be23150c52d02ceb96c9249a55c931cc73fdca4134f051282077b
+MISC ChangeLog 7357 SHA256 3d6b9c76b59f70bf6a9734b4c860ab2b7b06b12e1003588d522e498abaaaaffe SHA512 d7f6361d168c8b5f64ae729cf2be05a93a3b4324e5f3f88d167d0a619ed268b93fb9759bf28db7a85c988d43348cf5057f3e643da0ca1d42ef2ea27dd9da7d0f WHIRLPOOL 47c765c3166a27943e59df1e1ce1c4c2a8bb984cae1c0772767a36da51ee45ea3fca53d2e5d39f513e3aafcdef1b93b6b43185f0d5fb0b4904d1c8f82d165ea8
 MISC metadata.xml 260 SHA256 c70e2838f3c7822bf3cfcc656a554774015564400160e83d79b616f11a04e813 SHA512 c172c8a67accb9baa54e9d61480e4f9ff1ea46a4bd6039d251cec97fdb1742e16bf2a817b02573915375a31f991544151448dc9defa95ef5d3a9b8cb133141ef WHIRLPOOL 2b58e580e1eda6e45255643f739889dffc91630fa3f8f27349c6f0447804c69aecc0cd7a7a3da5c866f76319dde3499f41701dfb7b0d4635db2398df809f45a9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlMxZ30ACgkQso7CE7gHKw3jKQCfYxMebgWc14DVLZ3/xsATdX6h
+73MAnRAj9MoI26aXwfUev2ECJTb1naTO
+=4A35
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pythonmagick/files/pythonmagick-0.9.8-build.patch b/dev-python/pythonmagick/files/pythonmagick-0.9.8-build.patch
new file mode 100644
index 000000000000..95d3b4d29ded
--- /dev/null
+++ b/dev-python/pythonmagick/files/pythonmagick-0.9.8-build.patch
@@ -0,0 +1,14 @@
+Index: PythonMagick-0.9.8/pythonmagick_src/_Image.cpp
+===================================================================
+--- pythonmagick_src/_Image.cpp
++++ pythonmagick_src/_Image.cpp
+@@ -93,7 +93,7 @@ void Export_pyste_src_Image()
+         .def("colorize", (void (Magick::Image::*)(const unsigned int, const unsigned int, const unsigned int, const Magick::Color&) )&Magick::Image::colorize)
+         .def("colorize", (void (Magick::Image::*)(const unsigned int, const Magick::Color&) )&Magick::Image::colorize)
+         .def("comment", (void (Magick::Image::*)(const std::string&) )&Magick::Image::comment)
+-        .def("compare", &Magick::Image::compare)
++        .def("compare", (bool (Magick::Image::*)(const Magick::Image&) )&Magick::Image::compare)
+         .def("composite", (void (Magick::Image::*)(const Magick::Image&, const ::ssize_t, const ::ssize_t, const MagickCore::CompositeOperator) )&Magick::Image::composite, Magick_Image_composite_overloads_3_4())
+         .def("composite", (void (Magick::Image::*)(const Magick::Image&, const Magick::Geometry&, const MagickCore::CompositeOperator) )&Magick::Image::composite, Magick_Image_composite_overloads_2_3())
+         .def("composite", (void (Magick::Image::*)(const Magick::Image&, const MagickCore::GravityType, const MagickCore::CompositeOperator) )&Magick::Image::composite, Magick_Image_composite_overloads_2_3())
+
diff --git a/dev-python/pythonmagick/pythonmagick-0.9.8.ebuild b/dev-python/pythonmagick/pythonmagick-0.9.8.ebuild
index 9dc97aaf44c5..4e5b3ff924c8 100644
--- a/dev-python/pythonmagick/pythonmagick-0.9.8.ebuild
+++ b/dev-python/pythonmagick/pythonmagick-0.9.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/pythonmagick-0.9.8.ebuild,v 1.4 2013/04/23 05:35:51 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/pythonmagick-0.9.8.ebuild,v 1.5 2014/03/25 11:31:54 idella4 Exp $
 
 EAPI="4"
 PYTHON_DEPEND="*:2.6"
@@ -37,6 +37,7 @@ PYTHON_CXXFLAGS=("2.* + -fno-strict-aliasing")
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-0.9.1-use_active_python_version.patch"
 	epatch "${FILESDIR}/${PN}-0.9.2-fix_detection_of_python_includedir.patch"
+	epatch "${FILESDIR}/${P}-build.patch"
 
 	sed -e "s/AM_PATH_PYTHON(3.1)/AM_PATH_PYTHON(2.6)/" -i configure.ac || die "sed failed"