6 files changed, 48 insertions, 125 deletions
diff --git a/dev-python/pythonmagick/ChangeLog b/dev-python/pythonmagick/ChangeLog
index 3ccba3851eea..6c2f53660758 100644
--- a/dev-python/pythonmagick/ChangeLog
+++ b/dev-python/pythonmagick/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/pythonmagick
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/ChangeLog,v 1.17 2009/01/27 10:08:21 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/ChangeLog,v 1.18 2009/02/02 12:22:07 bicatali Exp $
+
+*pythonmagick-0.8-r2 (02 Feb 2009)
+
+  02 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/pythonmagick-0.6-gentoo_misc_fixes.patch,
+  +files/pythonmagick-0.8-python26.patch, -pythonmagick-0.6.ebuild,
+  -pythonmagick-0.7-r1.ebuild, -pythonmagick-0.8-r1.ebuild,
+  +pythonmagick-0.8-r2.ebuild:
+  Added fix for python-2.6, re-use autotools, removed older versions
 
   27 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org>
   pythonmagick-0.8-r1.ebuild:
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
deleted file mode 100644
index 945511019680..000000000000
--- a/dev-python/pythonmagick/files/pythonmagick-0.6-gentoo_misc_fixes.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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']
--    CPP_FLAGS=['-DBOOST_PYTHON_STATIC_LIB','-O2']
-+    BOOST_PYTHON_LIB=['libboost_python']
-+    CPP_FLAGS=['-DBOOST_PYTHON_STATIC_LIB']
- 
- #   setup the environment
- env=Environment(
-     LIBPATH=['./',BOOSTLIBPATH, IM_LIB_PATH],
-     CPPPATH=[BOOST, PYTHON_INCLUDE] + IM_INCLUDE_PATH,
--    RPATH=['./',BOOSTLIBPATH],
-+    RPATH=[BOOSTLIBPATH],
-     CPPFLAGS=CPP_FLAGS
- )
-+env.SConsignFile()
- 
- def fix_includes(target,source,env):
-     for t in target:
diff --git a/dev-python/pythonmagick/files/pythonmagick-0.8-python26.patch b/dev-python/pythonmagick/files/pythonmagick-0.8-python26.patch
new file mode 100644
index 000000000000..be31eebb64b2
--- /dev/null
+++ b/dev-python/pythonmagick/files/pythonmagick-0.8-python26.patch
@@ -0,0 +1,31 @@
+diff -Nur PythonMagick-0.8.orig/configure.ac PythonMagick-0.8/configure.ac
+--- PythonMagick-0.8.orig/configure.ac	2009-02-02 11:53:17.965859950 +0000
++++ PythonMagick-0.8/configure.ac	2009-02-02 11:54:04.118583794 +0000
+@@ -17,7 +17,7 @@
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+ AC_PROG_LIBTOOL
+-AM_PATH_PYTHON(2.5)
++AM_PATH_PYTHON
+ PKG_PROG_PKG_CONFIG
+ 
+ # Checks for libraries.
+diff -Nur PythonMagick-0.8.orig/m4/ax_python.m4 PythonMagick-0.8/m4/ax_python.m4
+--- PythonMagick-0.8.orig/m4/ax_python.m4	2009-02-02 11:53:17.965859950 +0000
++++ PythonMagick-0.8/m4/ax_python.m4	2009-02-02 11:53:50.063895989 +0000
+@@ -58,13 +58,13 @@
+ AC_DEFUN([AX_PYTHON],
+ [AC_MSG_CHECKING(for python build information)
+ AC_MSG_RESULT([])
+-for python in python2.5 python2.4 python2.3 python2.2 python2.1 python; do
++for python in python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; 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,,`]],
++   [[ax_python_header=`locate $ax_python_bin/Python.h | head -n 1 | 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.6.ebuild b/dev-python/pythonmagick/pythonmagick-0.6.ebuild
deleted file mode 100644
index c705323ac069..000000000000
--- a/dev-python/pythonmagick/pythonmagick-0.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/pythonmagick-0.6.ebuild,v 1.5 2008/10/27 10:54:06 hawking Exp $
-
-inherit eutils python multilib toolchain-funcs
-
-KEYWORDS="~x86"
-
-MY_PN=PythonMagick
-
-DESCRIPTION="Python bindings for ImageMagick"
-SRC_URI="http://www.imagemagick.org/download/python/${MY_PN}-${PV}.tar.gz"
-HOMEPAGE="http://www.imagemagick.org/script/api.php"
-SLOT="0"
-LICENSE="as-is"
-IUSE=""
-
-RDEPEND=">=media-gfx/imagemagick-1.1.7
-	>=dev-libs/boost-1.34.0"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/scons"
-
-S=${WORKDIR}/${MY_PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo_misc_fixes.patch"
-}
-
-src_compile() {
-	python_version
-	sed -i \
-		-e "s#\(BOOST\)=.*#\1='/usr/include/boost'#" \
-		-e "s#\(BOOSTLIBPATH\)=.*#\1='/usr/lib'#" \
-		-e "s#\(PYTHONINCLUDE\)=.*#\1='/usr/include/python${PYVER}'#" \
-		-e "s#\(Environment(\)#\1 CXX='$(tc-getCXX)',#" \
-		-e "s#\(CPPFLAGS\)=#\1='${CXXFLAGS}'.split()+#" \
-		SConstruct || die "sed failed"
-
-	# FIXME: Until we have a var or function for it
-	numjobs=$(sed -e 's/.*\(\-j[ 0-9]\+\) .*/\1/' <<< ${MAKEOPTS})
-
-	scons mode=release ${numjobs} || die "scons failed"
-}
-
-src_install() {
-	python_need_rebuild
-	insinto /usr/$(get_libdir)/python${PYVER}/site-packages
-	doins -r PythonMagick
-}
diff --git a/dev-python/pythonmagick/pythonmagick-0.7-r1.ebuild b/dev-python/pythonmagick/pythonmagick-0.7-r1.ebuild
deleted file mode 100644
index 45963abc865f..000000000000
--- a/dev-python/pythonmagick/pythonmagick-0.7-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/pythonmagick-0.7-r1.ebuild,v 1.4 2008/11/16 16:33:27 flameeyes Exp $
-
-NEED_PYTHON=2.5
-inherit python multilib
-
-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="as-is"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=media-gfx/imagemagick-6.2
-	>=dev-libs/boost-1.34.0"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	econf
-	emake || die "emake failed"
-}
-
-src_install() {
-	python_need_rebuild
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/${MY_PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/${MY_PN}
-}
diff --git a/dev-python/pythonmagick/pythonmagick-0.8-r1.ebuild b/dev-python/pythonmagick/pythonmagick-0.8-r2.ebuild
index c70a03697e90..6d7cea4daa34 100644
--- a/dev-python/pythonmagick/pythonmagick-0.8-r1.ebuild
+++ b/dev-python/pythonmagick/pythonmagick-0.8-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/pythonmagick-0.8-r1.ebuild,v 1.2 2009/01/27 10:08:21 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/pythonmagick-0.8-r2.ebuild,v 1.1 2009/02/02 12:22:07 bicatali Exp $
 
 NEED_PYTHON=2.5
 EAPI=2
-inherit python flag-o-matic
+inherit eutils python flag-o-matic autotools
 
 MY_PN=PythonMagick
 MY_P=${MY_PN}-${PV}
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=media-gfx/imagemagick-6.2
+RDEPEND=">=media-gfx/imagemagick-6.4
 	>=dev-libs/boost-1.34.0"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
@@ -26,9 +26,11 @@ DEPEND="${RDEPEND}
 PYTHON_MODNAME="${MY_PN}"
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
+src_prepare() {
 	append-flags $(python-config --includes)
-	export BOOST_PYTHON_LIB="boost_python"
+	export BOOST_PYTHON_LIB=boost_python
+	epatch "${FILESDIR}"/${P}-python26.patch
+	AT_M4DIR="m4" eautoreconf
 }
 
 src_install() {