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

(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r1 x86_64)

3 files changed, 52 insertions, 61 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/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
-}