Set SUPPORT_PYTHON_ABIS.

Package-Manager: portage-HEAD/cvs/Linux x86_64

3 files changed, 56 insertions, 15 deletions

diff --git a/dev-python/pythonmagick/ChangeLog b/dev-python/pythonmagick/ChangeLog
index 4a11cd69a550..a22e9ab2751d 100644
--- a/dev-python/pythonmagick/ChangeLog
+++ b/dev-python/pythonmagick/ChangeLog
@@ -1,6 +1,11 @@
 # 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.23 2010/05/18 16:53:51 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/ChangeLog,v 1.24 2010/05/29 15:50:32 arfrever Exp $
+
+  29 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  pythonmagick-0.9.1.ebuild,
+  +files/pythonmagick-0.9.1-use_active_python_version.patch:
+  Set SUPPORT_PYTHON_ABIS.
 
   18 May 2010; Sébastien Fabbro <bicatali@gentoo.org>
   -pythonmagick-0.8-r2.ebuild, pythonmagick-0.9.1.ebuild:
diff --git a/dev-python/pythonmagick/files/pythonmagick-0.9.1-use_active_python_version.patch b/dev-python/pythonmagick/files/pythonmagick-0.9.1-use_active_python_version.patch
new file mode 100644
index 000000000000..4293fc17df57
--- /dev/null
+++ b/dev-python/pythonmagick/files/pythonmagick-0.9.1-use_active_python_version.patch
@@ -0,0 +1,21 @@
+--- m4/ax_python.m4
++++ m4/ax_python.m4
+@@ -58,13 +58,14 @@
+ AC_DEFUN([AX_PYTHON],
+ [AC_MSG_CHECKING(for python build information)
+ AC_MSG_RESULT([])
+-for python in python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
++for python in python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1; do
+ AC_CHECK_PROGS(PYTHON_BIN, [$python])
+ ax_python_bin=$PYTHON_BIN
+ if test x$ax_python_bin != x; then
+-   AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no)
+-   AC_CHECK_HEADER([$ax_python_bin/Python.h],
+-   [[ax_python_header=`locate $ax_python_bin/Python.h | sed -e s,/Python.h,,`]],
++   [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=no)
+    if test $ax_python_lib != no; then
+      if test $ax_python_header != no; then
diff --git a/dev-python/pythonmagick/pythonmagick-0.9.1.ebuild b/dev-python/pythonmagick/pythonmagick-0.9.1.ebuild
index 54176077e0fc..015a89a8f10d 100644
--- a/dev-python/pythonmagick/pythonmagick-0.9.1.ebuild
+++ b/dev-python/pythonmagick/pythonmagick-0.9.1.ebuild
@@ -1,12 +1,16 @@
 # 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.1.ebuild,v 1.5 2010/05/18 16:53:51 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/pythonmagick-0.9.1.ebuild,v 1.6 2010/05/29 15:50:32 arfrever Exp $
 
-EAPI=2
-inherit python flag-o-matic
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_EXPORT_PHASE_FUNCTIONS="1"
 
-MY_PN=PythonMagick
-MY_P=${MY_PN}-${PV}
+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"
@@ -21,22 +25,33 @@ RDEPEND=">=media-gfx/imagemagick-6.4
 	>=dev-libs/boost-1.35.0[python]"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
+RESTRICT_PYTHON_ABIS="3.*"
 
-PYTHON_MODNAME="${MY_PN}"
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-	append-flags $(python-config --includes)
-	export BOOST_PYTHON_LIB=boost_python
+src_prepare() {
+	epatch "${FILESDIR}/${P}-use_active_python_version.patch"
+	eautoreconf
+
+	# Disable byte-compilation.
+	echo "#!/bin/sh" > config/py-compile
+
+	python_src_prepare
 }
 
 src_configure() {
-	# no need of static library for python module
-	econf --disable-static
+	python_src_configure --disable-static BOOST_PYTHON_LIB="boost_python"
 }
 
 src_install() {
-	python_need_rebuild
-	emake DESTDIR="${D}" install || die "emake install failed"
-	rm -f "${D}"$(python_get_sitedir)/${MY_PN}/*.la
+	python_src_install
+	python_clean_installation_image
+}
+
+pkg_postinst() {
+	python_mod_optimize PythonMagick
+}
+
+pkg_postrm() {
+	python_mod_cleanup PythonMagick
 }