Revision bump. Fixes #215038, thanks to René 'Necoro' Neumann. Keyworded ~amd64. Drop old.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r1 x86_64

4 files changed, 57 insertions, 66 deletions

diff --git a/dev-python/pythonmagick/ChangeLog b/dev-python/pythonmagick/ChangeLog
index 98e7b889cb87..1d87aa512dc5 100644
--- a/dev-python/pythonmagick/ChangeLog
+++ b/dev-python/pythonmagick/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pythonmagick
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/ChangeLog,v 1.10 2008/05/29 16:33:34 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/ChangeLog,v 1.11 2008/06/25 17:57:42 hawking Exp $
+
+*pythonmagick-0.7-r1 (25 Jun 2008)
+
+  25 Jun 2008; Ali Polatel <hawking@gentoo.org> -pythonmagick-0.7.ebuild,
+  +pythonmagick-0.7-r1.ebuild:
+  Revision bump. Fixes #215038, thanks to René 'Necoro' Neumann. Keyworded
+  ~amd64. Drop old.
 
   29 May 2008; Ali Polatel <hawking@gentoo.org> pythonmagick-0.6.ebuild,
   pythonmagick-0.7.ebuild:
diff --git a/dev-python/pythonmagick/Manifest b/dev-python/pythonmagick/Manifest
index 3cdc9b6d6266..dc30306e6b02 100644
--- a/dev-python/pythonmagick/Manifest
+++ b/dev-python/pythonmagick/Manifest
@@ -5,13 +5,13 @@ AUX pythonmagick-0.6-gentoo_misc_fixes.patch 745 RMD160 56e53df20162729f38bb30c3
 DIST PythonMagick-0.6.tar.gz 19258 RMD160 295b19ae7dd4c60292f7c9eeb39c6644035b9b8a SHA1 498e000d0e59fe7251b3660a130065e97cdf33fc SHA256 487a2253a6843d32023daa124b0e6e5f82d5ec0c8d5213214184066734073b72
 DIST PythonMagick-0.7.tar.gz 361197 RMD160 540332a24829e4510e56220d61a66e4e1cad0370 SHA1 86c32774fbca30177cadd027fffcea4a174e1929 SHA256 e15354bdb3aeb371f483ec8f4b8536f5baca22d06fdd05b188517bd6be9fa394
 EBUILD pythonmagick-0.6.ebuild 1353 RMD160 5db1af3f8d1208b5bd57fde61443a5e11855600f SHA1 d45485a57d558307ffc2f4b448526a2de34656e4 SHA256 e8a570a03b1e296655444781b5c80f3a51ad10877886d87ac437d6d506098187
-EBUILD pythonmagick-0.7.ebuild 1523 RMD160 058993ea91d854e724f4e7497c1342dcd95ffcc3 SHA1 324233ce3694801466611ef96732d3385011daba SHA256 ce14c6466fc8fa8671f12aa39af31708e223a70730f879eef19f0065a142657e
-MISC ChangeLog 1531 RMD160 0f3e830553960a06d581eadbf9621c87542457ba SHA1 f3445b0acca84925127e28d678a5fbd9b010d66c SHA256 22e786c2e5156ea7d96765420843cf5c08cdc66196dee180cb35231755303c44
+EBUILD pythonmagick-0.7-r1.ebuild 1042 RMD160 2a033ef21b6dac8756c9a8b83b632553053c84c9 SHA1 8010dfc10a0175b24c2e995e220dc59208992901 SHA256 82b0991eaed4f3326f17fd710b9e6d839de745c26d2e62b2ac8b6e2c5f25b0e8
+MISC ChangeLog 1769 RMD160 e9b8235a271a89d85890c12d7c00510e60f3bd63 SHA1 b2b847048219bbb1baba0feaff89bae1bd028118 SHA256 ea16931a3c43e488f463cdb506d73d62a34157e950f4a5ae0104db588596be98
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkg+2uAACgkQQU4yORhF8iAFjwCgo/dd8A9rF36x0/ua1EmwxS2S
-teMAn1Hv3zJZocRQK2fvf2bIv4bM8LS3
-=JFQv
+iEYEARECAAYFAkhihx4ACgkQQU4yORhF8iDKTQCeMlDj2h4BzW64EtTuXLb5ELtE
+W+gAn3KxCzBxNcxw1xPQqDNXwtYcIW6v
+=M9W+
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pythonmagick/pythonmagick-0.7-r1.ebuild b/dev-python/pythonmagick/pythonmagick-0.7-r1.ebuild
new file mode 100644
index 000000000000..38729283121e
--- /dev/null
+++ b/dev-python/pythonmagick/pythonmagick-0.7-r1.ebuild
@@ -0,0 +1,44 @@
+# 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.1 2008/06/25 17:57:42 hawking Exp $
+
+NEED_PYTHON=2.5
+inherit python multilib toolchain-funcs
+
+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=""
+
+DEPEND=">=media-gfx/imagemagick-6.2
+		>=dev-libs/boost-1.34.0"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	filter-ldflags -Wl,--as-needed --as-needed
+
+	econf
+	emake || die "emake failed"
+}
+
+src_install() {
+	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.7.ebuild b/dev-python/pythonmagick/pythonmagick-0.7.ebuild
deleted file mode 100644
index deb7f4fa3404..000000000000
--- a/dev-python/pythonmagick/pythonmagick-0.7.ebuild
+++ /dev/null
@@ -1,60 +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.ebuild,v 1.2 2008/05/29 16:33:34 hawking Exp $
-
-inherit eutils python multilib toolchain-funcs
-
-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="~x86"
-IUSE=""
-
-RDEPEND=">=media-gfx/imagemagick-1.1.7
-		>=dev-libs/boost-1.34.0"
-DEPEND="${RDEPEND}
-		dev-util/scons"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.6-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#\(PYTHON_INCLUDE\)=.*#\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() {
-	insinto /usr/$(get_libdir)/python${PYVER}/site-packages
-	doins -r PythonMagick
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/${MY_PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}