Version bump. Reference ssize_t in non-ambiguous way.

(Portage version: 2.2.0_alpha26_p10/cvs/Linux x86_64)

3 files changed, 178 insertions, 2 deletions

diff --git a/dev-python/pythonmagick/ChangeLog b/dev-python/pythonmagick/ChangeLog
index e6118eb1052c..6d9f06c12602 100644
--- a/dev-python/pythonmagick/ChangeLog
+++ b/dev-python/pythonmagick/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pythonmagick
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/ChangeLog,v 1.26 2010/09/10 22:14:53 arfrever Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/ChangeLog,v 1.27 2011/03/10 16:25:13 arfrever Exp $
+
+*pythonmagick-0.9.4 (10 Mar 2011)
+
+  10 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -pythonmagick-0.9.2.ebuild, +pythonmagick-0.9.4.ebuild,
+  +files/pythonmagick-0.9.4-ssize_t.patch:
+  Version bump. Reference ssize_t in non-ambiguous way.
 
   10 Sep 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   pythonmagick-0.9.2.ebuild:
diff --git a/dev-python/pythonmagick/files/pythonmagick-0.9.4-ssize_t.patch b/dev-python/pythonmagick/files/pythonmagick-0.9.4-ssize_t.patch
new file mode 100644
index 000000000000..43cb8bb495f4
--- /dev/null
+++ b/dev-python/pythonmagick/files/pythonmagick-0.9.4-ssize_t.patch
@@ -0,0 +1,108 @@
+--- pythonmagick_src/_DrawableViewbox.cpp
++++ pythonmagick_src/_DrawableViewbox.cpp
+@@ -16,7 +16,7 @@
+ 
+ struct Magick_DrawableViewbox_Wrapper: Magick::DrawableViewbox
+ {
+-    Magick_DrawableViewbox_Wrapper(PyObject* py_self_, ssize_t p0, ssize_t p1, ssize_t p2, ssize_t p3):
++    Magick_DrawableViewbox_Wrapper(PyObject* py_self_, ::ssize_t p0, ::ssize_t p1, ::ssize_t p2, ::ssize_t p3):
+         Magick::DrawableViewbox(p0, p1, p2, p3), py_self(py_self_) {}
+ 
+ 
+@@ -30,15 +30,15 @@
+ // Module ======================================================================
+ void Export_pyste_src_DrawableViewbox()
+ {
+-    class_< Magick::DrawableViewbox, boost::noncopyable, Magick_DrawableViewbox_Wrapper >("DrawableViewbox", init< ssize_t, ssize_t, ssize_t, ssize_t >())
+-        .def("x1", (void (Magick::DrawableViewbox::*)(ssize_t) )&Magick::DrawableViewbox::x1)
+-        .def("x1", (ssize_t (Magick::DrawableViewbox::*)() const)&Magick::DrawableViewbox::x1)
+-        .def("y1", (void (Magick::DrawableViewbox::*)(ssize_t) )&Magick::DrawableViewbox::y1)
+-        .def("y1", (ssize_t (Magick::DrawableViewbox::*)() const)&Magick::DrawableViewbox::y1)
+-        .def("x2", (void (Magick::DrawableViewbox::*)(ssize_t) )&Magick::DrawableViewbox::x2)
+-        .def("x2", (ssize_t (Magick::DrawableViewbox::*)() const)&Magick::DrawableViewbox::x2)
+-        .def("y2", (void (Magick::DrawableViewbox::*)(ssize_t) )&Magick::DrawableViewbox::y2)
+-        .def("y2", (ssize_t (Magick::DrawableViewbox::*)() const)&Magick::DrawableViewbox::y2)
++    class_< Magick::DrawableViewbox, boost::noncopyable, Magick_DrawableViewbox_Wrapper >("DrawableViewbox", init< ::ssize_t, ::ssize_t, ::ssize_t, ::ssize_t >())
++        .def("x1", (void (Magick::DrawableViewbox::*)(::ssize_t) )&Magick::DrawableViewbox::x1)
++        .def("x1", (::ssize_t (Magick::DrawableViewbox::*)() const)&Magick::DrawableViewbox::x1)
++        .def("y1", (void (Magick::DrawableViewbox::*)(::ssize_t) )&Magick::DrawableViewbox::y1)
++        .def("y1", (::ssize_t (Magick::DrawableViewbox::*)() const)&Magick::DrawableViewbox::y1)
++        .def("x2", (void (Magick::DrawableViewbox::*)(::ssize_t) )&Magick::DrawableViewbox::x2)
++        .def("x2", (::ssize_t (Magick::DrawableViewbox::*)() const)&Magick::DrawableViewbox::x2)
++        .def("y2", (void (Magick::DrawableViewbox::*)(::ssize_t) )&Magick::DrawableViewbox::y2)
++        .def("y2", (::ssize_t (Magick::DrawableViewbox::*)() const)&Magick::DrawableViewbox::y2)
+     ;
+ 
+ }
+--- pythonmagick_src/_Geometry.cpp
++++ pythonmagick_src/_Geometry.cpp
+@@ -22,10 +22,10 @@
+         .def("width", (size_t (Magick::Geometry::*)() const)&Magick::Geometry::width)
+         .def("height", (void (Magick::Geometry::*)(size_t) )&Magick::Geometry::height)
+         .def("height", (size_t (Magick::Geometry::*)() const)&Magick::Geometry::height)
+-        .def("xOff", (void (Magick::Geometry::*)(ssize_t) )&Magick::Geometry::xOff)
+-        .def("xOff", (ssize_t (Magick::Geometry::*)() const)&Magick::Geometry::xOff)
+-        .def("yOff", (void (Magick::Geometry::*)(ssize_t) )&Magick::Geometry::yOff)
+-        .def("yOff", (ssize_t (Magick::Geometry::*)() const)&Magick::Geometry::yOff)
++        .def("xOff", (void (Magick::Geometry::*)(::ssize_t) )&Magick::Geometry::xOff)
++        .def("xOff", (::ssize_t (Magick::Geometry::*)() const)&Magick::Geometry::xOff)
++        .def("yOff", (void (Magick::Geometry::*)(::ssize_t) )&Magick::Geometry::yOff)
++        .def("yOff", (::ssize_t (Magick::Geometry::*)() const)&Magick::Geometry::yOff)
+         .def("xNegative", (void (Magick::Geometry::*)(bool) )&Magick::Geometry::xNegative)
+         .def("xNegative", (bool (Magick::Geometry::*)() const)&Magick::Geometry::xNegative)
+         .def("yNegative", (void (Magick::Geometry::*)(bool) )&Magick::Geometry::yNegative)
+--- pythonmagick_src/_Image.cpp
++++ pythonmagick_src/_Image.cpp
+@@ -94,7 +94,7 @@
+         .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("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 ::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())
+         .def("contrast", &Magick::Image::contrast)
+@@ -111,18 +111,18 @@
+         .def("equalize", &Magick::Image::equalize)
+         .def("erase", &Magick::Image::erase)
+         .def("flip", &Magick::Image::flip)
+-        .def("floodFillColor", (void (Magick::Image::*)(const ssize_t, const ssize_t, const Magick::Color&) )&Magick::Image::floodFillColor)
++        .def("floodFillColor", (void (Magick::Image::*)(const ::ssize_t, const ::ssize_t, const Magick::Color&) )&Magick::Image::floodFillColor)
+         .def("floodFillColor", (void (Magick::Image::*)(const Magick::Geometry&, const Magick::Color&) )&Magick::Image::floodFillColor)
+-        .def("floodFillColor", (void (Magick::Image::*)(const ssize_t, const ssize_t, const Magick::Color&, const Magick::Color&) )&Magick::Image::floodFillColor)
++        .def("floodFillColor", (void (Magick::Image::*)(const ::ssize_t, const ::ssize_t, const Magick::Color&, const Magick::Color&) )&Magick::Image::floodFillColor)
+         .def("floodFillColor", (void (Magick::Image::*)(const Magick::Geometry&, const Magick::Color&, const Magick::Color&) )&Magick::Image::floodFillColor)
+         .def("floodFillOpacity", &Magick::Image::floodFillOpacity)
+-        .def("floodFillTexture", (void (Magick::Image::*)(const ssize_t, const ssize_t, const Magick::Image&) )&Magick::Image::floodFillTexture)
++        .def("floodFillTexture", (void (Magick::Image::*)(const ::ssize_t, const ::ssize_t, const Magick::Image&) )&Magick::Image::floodFillTexture)
+         .def("floodFillTexture", (void (Magick::Image::*)(const Magick::Geometry&, const Magick::Image&) )&Magick::Image::floodFillTexture)
+-        .def("floodFillTexture", (void (Magick::Image::*)(const ssize_t, const ssize_t, const Magick::Image&, const Magick::Color&) )&Magick::Image::floodFillTexture)
++        .def("floodFillTexture", (void (Magick::Image::*)(const ::ssize_t, const ::ssize_t, const Magick::Image&, const Magick::Color&) )&Magick::Image::floodFillTexture)
+         .def("floodFillTexture", (void (Magick::Image::*)(const Magick::Geometry&, const Magick::Image&, const Magick::Color&) )&Magick::Image::floodFillTexture)
+         .def("flop", &Magick::Image::flop)
+         .def("frame", (void (Magick::Image::*)(const Magick::Geometry&) )&Magick::Image::frame, Magick_Image_frame_overloads_0_1())
+-        .def("frame", (void (Magick::Image::*)(const size_t, const size_t, const ssize_t, const ssize_t) )&Magick::Image::frame, Magick_Image_frame_overloads_2_4())
++        .def("frame", (void (Magick::Image::*)(const size_t, const size_t, const ::ssize_t, const ::ssize_t) )&Magick::Image::frame, Magick_Image_frame_overloads_2_4())
+         .def("gamma", (void (Magick::Image::*)(const double) )&Magick::Image::gamma)
+         .def("gamma", (void (Magick::Image::*)(const double, const double, const double) )&Magick::Image::gamma)
+         .def("gaussianBlur", &Magick::Image::gaussianBlur)
+@@ -183,7 +183,7 @@
+         .def("write", (void (Magick::Image::*)(Magick::Blob*) )&Magick::Image::write)
+         .def("write", (void (Magick::Image::*)(Magick::Blob*, const std::string&) )&Magick::Image::write)
+         .def("write", (void (Magick::Image::*)(Magick::Blob*, const std::string&, const size_t) )&Magick::Image::write)
+-        .def("write", (void (Magick::Image::*)(const ssize_t, const ssize_t, const size_t, const size_t, const std::string&, const MagickCore::StorageType, void*) )&Magick::Image::write)
++        .def("write", (void (Magick::Image::*)(const ::ssize_t, const ::ssize_t, const size_t, const size_t, const std::string&, const MagickCore::StorageType, void*) )&Magick::Image::write)
+         .def("zoom", &Magick::Image::zoom)
+         .def("adjoin", (void (Magick::Image::*)(const bool) )&Magick::Image::adjoin)
+         .def("adjoin", (bool (Magick::Image::*)() const)&Magick::Image::adjoin)
+@@ -299,8 +299,8 @@
+         .def("penColor", (Magick::Color (Magick::Image::*)() const)&Magick::Image::penColor)
+         .def("penTexture", (void (Magick::Image::*)(const Magick::Image&) )&Magick::Image::penTexture)
+         .def("penTexture", (Magick::Image (Magick::Image::*)() const)&Magick::Image::penTexture)
+-        .def("pixelColor", (void (Magick::Image::*)(const ssize_t, const ssize_t, const Magick::Color&) )&Magick::Image::pixelColor)
+-        .def("pixelColor", (Magick::Color (Magick::Image::*)(const ssize_t, const ssize_t) const)&Magick::Image::pixelColor)
++        .def("pixelColor", (void (Magick::Image::*)(const ::ssize_t, const ::ssize_t, const Magick::Color&) )&Magick::Image::pixelColor)
++        .def("pixelColor", (Magick::Color (Magick::Image::*)(const ::ssize_t, const ::ssize_t) const)&Magick::Image::pixelColor)
+         .def("profile", (void (Magick::Image::*)(const std::string, const Magick::Blob&) )&Magick::Image::profile)
+         .def("profile", (Magick::Blob (Magick::Image::*)(const std::string) const)&Magick::Image::profile)
+         .def("quality", (void (Magick::Image::*)(const size_t) )&Magick::Image::quality)
diff --git a/dev-python/pythonmagick/pythonmagick-0.9.4.ebuild b/dev-python/pythonmagick/pythonmagick-0.9.4.ebuild
new file mode 100644
index 000000000000..afa08eb07584
--- /dev/null
+++ b/dev-python/pythonmagick/pythonmagick-0.9.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/pythonmagick-0.9.4.ebuild,v 1.1 2011/03/10 16:25:13 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.[45] 3.* *-jython"
+PYTHON_EXPORT_PHASE_FUNCTIONS="1"
+
+inherit autotools eutils python
+
+MY_PN="PythonMagick"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python bindings for ImageMagick"
+HOMEPAGE="http://www.imagemagick.org/script/api.php"
+SRC_URI="http://www.imagemagick.org/download/python/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=media-gfx/imagemagick-6.4
+	>=dev-libs/boost-1.35.0[python]"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+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}-ssize_t.patch"
+	eautoreconf
+
+	# Disable byte-compilation.
+	echo "#!/bin/sh" > config/py-compile
+
+	python_src_prepare
+}
+
+src_configure() {
+	python_src_configure --disable-static BOOST_PYTHON_LIB="boost_python"
+}
+
+src_install() {
+	python_src_install
+	python_clean_installation_image
+}
+
+pkg_postinst() {
+	python_mod_optimize PythonMagick
+}
+
+pkg_postrm() {
+	python_mod_cleanup PythonMagick
+}