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

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

7 files changed, 111 insertions, 12 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/Manifest b/dev-python/pythonmagick/Manifest
index 6f262c79f8de..57cb7b733c45 100644
--- a/dev-python/pythonmagick/Manifest
+++ b/dev-python/pythonmagick/Manifest
@@ -2,18 +2,22 @@
 Hash: SHA256
 
 AUX pythonmagick-0.9.1-use_active_python_version.patch 1101 SHA256 6b232316ee18b1bdb40f1eef8768c51485bb179af1d640b3cacc03745a638731 SHA512 64e3cb6f731f673c5f1c56bb5fd5aa953a3d31acd6e13ff4f782c10e9def317a358463d1291c982a5772692b7f3e1286145bf4aea3be6ed625790aa88a9c917a WHIRLPOOL e05396fdb4138d83cf30a85817cfc871e440ec47b6bdfe8082e25e62133e50cd1f4e407f385ce8869d4ba34a8e05b42a30b820a285f2261f1c69629ef2d1ae87
+AUX pythonmagick-0.9.10-Makefile.am.patch 515 SHA256 39618587cdbb95b04f07c059c5d1abab220962d79e4ac16cd40dc22472e49229 SHA512 f66a6c99faf6c3424b1be722814855345011335840c9605eae77c94ed58eeeabaee2168245572fc880f6640c8822bb4426d61decf800c1179bf7d03cb505271f WHIRLPOOL dcdb6e613aa036bc45c480e2f53d2a6774dbe136a212854657dc79528eea1a43978aaa646d3b593e36bfddc40edbfe332ee5fcdb367c49d8b9e2d66de738c256
+AUX pythonmagick-0.9.10-ax_boost_python.patch 930 SHA256 ebacdf272a7d5139591d21e5dcba3bb2ba6089fbf4304f3b3729f2d9b2401a8c SHA512 71c63fe4e01f9f6bab8eb661175202b3054baed68b1b4fe81953034d4d7360196cd8376aaa6341b977470ab6e52351020d784efbc68d9fc8a5eb933641a3a19c WHIRLPOOL e9f8ab813b349ef77662b349af0ad1dedd6243300a1be9f2970a57f2f4ea9819e823b1544d476bf4cf297dd09c66eb38b5b2e0778ced09ed40b3702efbbf9b72
 AUX pythonmagick-0.9.2-fix_detection_of_python_includedir.patch 645 SHA256 1b4e7d06d7270c111589d18ad6ba5ee90e182b7bd4d1bf490c5ba49d4144bfda SHA512 5aa2c52821104df8da703dcb08272777e1c8248f0d6feb452931c7b820452bf4dc3aabafc666f352f23f62892aef26e60bda515acd0906f011210bb947f9cea5 WHIRLPOOL 646e086684eb5e2077cad2de088b6f35f231bf4cdded98b10bed492478c4288731f8445e4e2ee23a06de350ddadc2dc3e84102d4afc60f50a5ec273ae86968af
 AUX pythonmagick-0.9.8-build.patch 1386 SHA256 f42eae078c328f380ca8fa8f8ec0ce5c215ac2083619fee434b07267167252fd SHA512 c7a6f4aa4984e5ed57c426696f7d58f0464b805f6a0ae127862d3f20da06a7cdccd7beea3e572f16f35d0829e1a0693cc50768d8df6ee35240bd2f032610b798 WHIRLPOOL 1601a96fb50c8182ebf48d22a07684cb280a5eebc4f8844967d3a77600c42a09b5c826f2d5a8bd60cae88ebf371be36fd5b3cc5bf25649098794a440f1b21fdc
+DIST PythonMagick-0.9.10.tar.xz 257260 SHA256 d80ec9a8dc511515f32e759f45e3f687085435206dc6da47f0e49487770e805c SHA512 dcc81b57cd8e9da4afbcd2bddd56a5262ca34ecf077a55d9d70328bd6edacbef05207259058e0c32b2831cb60f06a0b700d7c87ff456266b69fb9a2fb9bede11 WHIRLPOOL ce804d4f1b6cfb4d3239c8f480605fda3fc141a6785dacec3828c2d839117adfeedca8c236d978b34197193479b0968e0b92235991e6f198b276fdb717d81fd5
 DIST PythonMagick-0.9.7.tar.xz 247772 SHA256 8c5fbd7030f52aca0e2f11e2d61c8040c8758975987033ee121473bfbee694f5 SHA512 cb69e10eb57bd38a7fac0c002b37fbd0d8f31da8db02a2413ac01b969b68b25227cb924c28ef9683dbb5c9a149ad779acb51af098682c6d537f4690753dc5b22 WHIRLPOOL a263295e493a6592439ffe5caa77afc5f362cea5506d4196cde103df66208f60ec444c7451fee0b9ad077eb0d361388d66b6b6c0d6fb290efa99cec412a8e3fe
 DIST PythonMagick-0.9.8.tar.xz 250200 SHA256 3e0d99128b0eec20c85a73308799b64a71fe28f443b7e9a3304a2c55c0ccf2be SHA512 b373310920dc7f14d410abc97fc3acca0e0a6919adcb25744b611933128eef9bf5868692cbae3d5a67919667d74c105faaa0771d785d6c5108f3d9663af6761a WHIRLPOOL 730c099af4fc7c21c5e254fc7dbdfb005755dd0a22ffeb57d7dbcb75af0d88efac2c44954ca72017091160a669cd521477239215c9f21cccee6861d9fd7f636e
-EBUILD pythonmagick-0.9.7-r1.ebuild 1732 SHA256 9c1457d09976650cf98287452b960ab94732bcd8f65990fee1a36f24f42a3474 SHA512 691074725a6bde2cdd2b2d65fbdd6bedf2958501f97c51447f5fcc93cebf404e30cbee15253eb8a845d867617189acb80f00ca609cad49535184264d589ecbe1 WHIRLPOOL 5b955c1b1c2eaed0eaf64d69226b41fa4185272b59b0f479305e3d438dbe7c33058f4f5df54bf7fd77fce9efeffbc23ff249aad7477d04b3b57955e9be51e16d
-EBUILD pythonmagick-0.9.8.ebuild 1656 SHA256 15c5db14da3744d2f5f68ba746bea54367f68cf2e8a7680a8cab06ecd2b2aaf7 SHA512 647023fff3383ed25fca8863859bd69d55746a0040b603be594caf18344c8964bdd9f749a1313a26fab321babeb063c460435e9a2954b87f1e92336cb81cf781 WHIRLPOOL fce70f3cae5411bb1c912635b7d7c9d0f528f8c9114dde65ceceb6dba162f5eca35ebc3cdb7be23150c52d02ceb96c9249a55c931cc73fdca4134f051282077b
-MISC ChangeLog 7357 SHA256 3d6b9c76b59f70bf6a9734b4c860ab2b7b06b12e1003588d522e498abaaaaffe SHA512 d7f6361d168c8b5f64ae729cf2be05a93a3b4324e5f3f88d167d0a619ed268b93fb9759bf28db7a85c988d43348cf5057f3e643da0ca1d42ef2ea27dd9da7d0f WHIRLPOOL 47c765c3166a27943e59df1e1ce1c4c2a8bb984cae1c0772767a36da51ee45ea3fca53d2e5d39f513e3aafcdef1b93b6b43185f0d5fb0b4904d1c8f82d165ea8
+EBUILD pythonmagick-0.9.10.ebuild 1373 SHA256 c9e66308b29209ae63a097ec6972c79a6960c631d35d15b4c8002015e4356ef8 SHA512 e743675de02dec6a951aabc1b23374221e5207aaa775133fcb56c573d982c501c157a6f786d253c4067257b2803ce1566dbaee2e13c11a1d41a5e0202ab692b5 WHIRLPOOL 1713eed2c822edc30344f0874ccda1c817e4ad7bfb70935440997fa4e8038c4edd4d92a4580799856d7fc9cd0ca1a76bdfbd062f60382b27c2f3f1ab9e600ba3
+EBUILD pythonmagick-0.9.7-r1.ebuild 1717 SHA256 ae6a27d47bd95e6769468eb1850d0deaeccc6040273c6ef66bafe81fe1543e18 SHA512 506aa13c650e02a20a34bd32a53d2c5116bcd6a6a82eb115eb4ab3e7d7dc01affa15d2e07bce9c4ffd277d304675a0c38c7600bf970fdf00041febb593eca550 WHIRLPOOL 46b5a6a20bf27d6b6c00b492a0d8a15e029fe70791a7712146cd26203721f8bbf87ef9d89b2d8c708354d881ba8841ebda9c668e5ef4ada72ecbd1148b235380
+EBUILD pythonmagick-0.9.8.ebuild 1641 SHA256 274a815bf7d111c08453745074c236992ec7ba818802bb24242df58d44f5e094 SHA512 21081f2c8d59013c4188c6fdf89b419c4608dcd326faa2d781d6ee3325502a0b3e776dd28bbe6e81496c43acfa82300691e0e0f4141e37f7ec169b9d5a4e4726 WHIRLPOOL 5f1d218fdc2788bf39e19fcce6b20a905360f2ec3435283a1c2cd779a9bd49b537a43c9a7c8f2b41e8b615133f2e725a45a0c56e8ffe15a282dc880e69061573
+MISC ChangeLog 7741 SHA256 eb020fca754cac719ba5eab85ab8925ff72ba2a6c852e964a061c423d3dc5aa7 SHA512 4ab74402927d2db8a7dc086c5fc1e2ed5dc8788e96546d45ba1109d726772e437f4bf6ba296a578d45d1ef7a68c6f873031bada66a72cbe8d84780e53fc648c9 WHIRLPOOL 5746a46cc9640a81ec0a570fb25a28c2e70320cbd1fc25984c129a326816e7c3c0d7f3fdde22fae9c6cce5fd3d4d0c6387358021875bcdc15e36108f5a0c437d
 MISC metadata.xml 260 SHA256 c70e2838f3c7822bf3cfcc656a554774015564400160e83d79b616f11a04e813 SHA512 c172c8a67accb9baa54e9d61480e4f9ff1ea46a4bd6039d251cec97fdb1742e16bf2a817b02573915375a31f991544151448dc9defa95ef5d3a9b8cb133141ef WHIRLPOOL 2b58e580e1eda6e45255643f739889dffc91630fa3f8f27349c6f0447804c69aecc0cd7a7a3da5c866f76319dde3499f41701dfb7b0d4635db2398df809f45a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMxZ30ACgkQso7CE7gHKw3jKQCfYxMebgWc14DVLZ3/xsATdX6h
-73MAnRAj9MoI26aXwfUev2ECJTb1naTO
-=4A35
+iF4EAREIAAYFAlNdJ2gACgkQC77qH+pIQ6Tr3AD9GXm6ENAwstUBfcAsRG5vh7Xe
+rrZY30d9oVikt0pK9SgA/Ag7NAbhjcAibK2pU1chgAIihfK3clHsHHhJiRF5SaBa
+=kgI+
 -----END PGP SIGNATURE-----
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"