Version bump (bug #326621). Don't use locate (bug #330405).

(Portage version: HEAD/cvs/Linux x86_64)

3 files changed, 79 insertions, 1 deletions

diff --git a/dev-python/pythonmagick/ChangeLog b/dev-python/pythonmagick/ChangeLog
index a22e9ab2751d..4aa3772b123a 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.24 2010/05/29 15:50:32 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/ChangeLog,v 1.25 2010/07/29 19:52:15 arfrever Exp $
+
+*pythonmagick-0.9.2 (29 Jul 2010)
+
+  29 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -pythonmagick-0.9.1.ebuild, +pythonmagick-0.9.2.ebuild,
+  +files/pythonmagick-0.9.2-fix_detection_of_python_includedir.patch:
+  Version bump (bug #326621). Don't use locate (bug #330405).
 
   29 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   pythonmagick-0.9.1.ebuild,
diff --git a/dev-python/pythonmagick/files/pythonmagick-0.9.2-fix_detection_of_python_includedir.patch b/dev-python/pythonmagick/files/pythonmagick-0.9.2-fix_detection_of_python_includedir.patch
new file mode 100644
index 000000000000..6d14363b3d1c
--- /dev/null
+++ b/dev-python/pythonmagick/files/pythonmagick-0.9.2-fix_detection_of_python_includedir.patch
@@ -0,0 +1,11 @@
+--- m4/ax_python.m4
++++ m4/ax_python.m4
+@@ -65,7 +65,7 @@
+    [python_version=`$ax_python_bin -c 'import sys; print(".".join(str(x) for x in sys.version_info[:2]))'`]
+    AC_CHECK_LIB(python$python_version, main, ax_python_lib=python$python_version, ax_python_lib=no)
+    AC_CHECK_HEADER([python$python_version/Python.h],
+-   [[ax_python_header=`locate python$python_version/Python.h | sed -e s,/Python.h,,`]],
++   [[ax_python_header=`$ax_python_bin -c 'import sys; print(sys.prefix + "/include/python%s.%s" % sys.version_info[:2])'`]],
+    ax_python_header=no)
+    if test $ax_python_lib != no; then
+      if test $ax_python_header != no; then
diff --git a/dev-python/pythonmagick/pythonmagick-0.9.2.ebuild b/dev-python/pythonmagick/pythonmagick-0.9.2.ebuild
new file mode 100644
index 000000000000..627b274e08e8
--- /dev/null
+++ b/dev-python/pythonmagick/pythonmagick-0.9.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/pythonmagick-0.9.2.ebuild,v 1.1 2010/07/29 19:52:15 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+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.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+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"
+	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
+}