Version bump. Convert to python-r1, bug 508860 by Martin von Gagern. Use mirror://imagemagick in SRC_URI.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

6 files changed, 101 insertions, 6 deletions

diff --git a/dev-python/pythonmagick/ChangeLog b/dev-python/pythonmagick/ChangeLog
index 01ba21a28b24..08c6a8aebb96 100644
--- a/dev-python/pythonmagick/ChangeLog
+++ b/dev-python/pythonmagick/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/pythonmagick
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/ChangeLog,v 1.45 2014/04/27 15:51:02 floppym Exp $
+
+*pythonmagick-0.9.10 (27 Apr 2014)
+
+  27 Apr 2014; Mike Gilbert <floppym@gentoo.org>
+  +files/pythonmagick-0.9.10-Makefile.am.patch,
+  +files/pythonmagick-0.9.10-ax_boost_python.patch, +pythonmagick-0.9.10.ebuild,
+  pythonmagick-0.9.7-r1.ebuild, pythonmagick-0.9.8.ebuild:
+  Version bump. Convert to python-r1, bug 508860 by Martin von Gagern. Use
+  mirror://imagemagick in SRC_URI.
 
   25 Mar 2014; Ian Delaney <idella4@gentoo.org>
   +files/pythonmagick-0.9.8-build.patch, pythonmagick-0.9.8.ebuild:
diff --git a/dev-python/pythonmagick/files/pythonmagick-0.9.10-Makefile.am.patch b/dev-python/pythonmagick/files/pythonmagick-0.9.10-Makefile.am.patch
new file mode 100644
index 000000000000..760aa2293f27
--- /dev/null
+++ b/dev-python/pythonmagick/files/pythonmagick-0.9.10-Makefile.am.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -27,7 +27,7 @@
+ _PythonMagick_la_LDFLAGS = -avoid-version -module $(BOOST_LDFLAGS)
+ 
+ # And the libraries to include
+-_PythonMagick_la_LIBADD = pythonmagick_src/libpymagick.la helpers_src/libhelper.la $(BOOST_LDFLAGS) -lboost_python $(MAGICKPP_LIBS) $(MAGICK_LIBS)
++_PythonMagick_la_LIBADD = pythonmagick_src/libpymagick.la helpers_src/libhelper.la $(BOOST_LDFLAGS) $(BOOST_PYTHON_LIB) $(MAGICKPP_LIBS) $(MAGICK_LIBS)
+ 
+ EXTRA_DIST = autogen.pl SConstruct pyste_src LICENSE
+ 
diff --git a/dev-python/pythonmagick/files/pythonmagick-0.9.10-ax_boost_python.patch b/dev-python/pythonmagick/files/pythonmagick-0.9.10-ax_boost_python.patch
new file mode 100644
index 000000000000..0cc3e8cf64f0
--- /dev/null
+++ b/dev-python/pythonmagick/files/pythonmagick-0.9.10-ax_boost_python.patch
@@ -0,0 +1,18 @@
+--- a/m4/ax_boost_python.m4
++++ b/m4/ax_boost_python.m4
+@@ -82,10 +82,11 @@
+      ax_python_lib=$with_boost_python
+      ax_boost_python_lib=boost_python-$with_boost_python
+    fi])
+-  BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
+-  for ax_lib in `ls $BOOSTLIBDIR/libboost_python*.so* $BOOSTLIBDIR/libboost_python*.dylib* $BOOSTLIBDIR/libboost_python*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_python.*\)\.so.*$;\1;' -e 's;^lib\(boost_python.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_python.*\)\.a.*$;\1;' ` $ax_python_lib $ax_boost_python_lib boost_python; do
+-    AC_CHECK_LIB($ax_lib, exit, [BOOST_PYTHON_LIB=$ax_lib break], , [$PYTHON_LDFLAGS])
+-  done
++  LDFLAGS_SAVED="$LDFLAGS"
++  LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
++  export LDFLAGS
++  AC_CHECK_LIB($ax_python_lib, exit, [BOOST_PYTHON_LIB=-l$ax_python_lib], , [$PYTHON_LDFLAGS])
++  LDFLAGS="$LDFLAGS_SAVED"
+   AC_SUBST(BOOST_PYTHON_LIB)
+ fi
+ ])dnl
diff --git a/dev-python/pythonmagick/pythonmagick-0.9.10.ebuild b/dev-python/pythonmagick/pythonmagick-0.9.10.ebuild
new file mode 100644
index 000000000000..fde992a77941
--- /dev/null
+++ b/dev-python/pythonmagick/pythonmagick-0.9.10.ebuild
@@ -0,0 +1,57 @@
+# 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.10.ebuild,v 1.1 2014/04/27 15:51:02 floppym Exp $
+
+EAPI="5"
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules"
+PYTHON_COMPAT=( python{2_7,3_2,3_3} )
+WANT_AUTOMAKE="1.12"
+
+inherit autotools-utils eutils python-r1
+
+MY_PN="PythonMagick"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python bindings for ImageMagick"
+HOMEPAGE="http://www.imagemagick.org/script/api.php"
+SRC_URI="mirror://imagemagick/python/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
+	>=media-gfx/imagemagick-6.4"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.10-Makefile.am.patch"
+	"${FILESDIR}/${PN}-0.9.10-ax_boost_python.patch"
+)
+
+src_configure() {
+	local myeconfargs=( --disable-static )
+
+	python_configure() {
+		if ! python_is_python3; then
+			local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+		fi
+		autotools-utils_src_configure --with-boost-python=boost_python-${EPYTHON#python}
+	}
+
+	python_parallel_foreach_impl python_configure
+}
+
+src_compile() {
+	python_foreach_impl autotools-utils_src_compile
+}
+
+src_install() {
+	python_foreach_impl autotools-utils_src_install
+}
diff --git a/dev-python/pythonmagick/pythonmagick-0.9.7-r1.ebuild b/dev-python/pythonmagick/pythonmagick-0.9.7-r1.ebuild
index b37de9520027..3b95283288c4 100644
--- a/dev-python/pythonmagick/pythonmagick-0.9.7-r1.ebuild
+++ b/dev-python/pythonmagick/pythonmagick-0.9.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 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.7-r1.ebuild,v 1.5 2012/05/04 15:12:12 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/pythonmagick-0.9.7-r1.ebuild,v 1.6 2014/04/27 15:51:02 floppym Exp $
 
 EAPI="3"
 PYTHON_DEPEND="*:2.6"
@@ -15,7 +15,7 @@ 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.xz"
+SRC_URI="mirror://imagemagick/python/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-python/pythonmagick/pythonmagick-0.9.8.ebuild b/dev-python/pythonmagick/pythonmagick-0.9.8.ebuild
index 4e5b3ff924c8..a1808d497770 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-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.5 2014/03/25 11:31:54 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/pythonmagick-0.9.8.ebuild,v 1.6 2014/04/27 15:51:02 floppym Exp $
 
 EAPI="4"
 PYTHON_DEPEND="*:2.6"
@@ -17,7 +17,7 @@ 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.xz"
+SRC_URI="mirror://imagemagick/python/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"