summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2009-01-23 17:49:56 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2009-01-23 17:49:56 +0000
commit8c45f58b8e66701a75e65126064bb717ecaaa048 (patch)
tree28d8ee244d82c710ce7a5e4df420a0b724530bfd /dev-python/pythonmagick
parentstable ppc64, bug 253077 (diff)
downloadgentoo-2-8c45f58b8e66701a75e65126064bb717ecaaa048.tar.gz
gentoo-2-8c45f58b8e66701a75e65126064bb717ecaaa048.tar.bz2
gentoo-2-8c45f58b8e66701a75e65126064bb717ecaaa048.zip
Upstream changed, and export boost_python to fix bug #255615#
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'dev-python/pythonmagick')
-rw-r--r--dev-python/pythonmagick/ChangeLog9
-rw-r--r--dev-python/pythonmagick/files/pythonmagick-0.8-as-needed.patch15
-rw-r--r--dev-python/pythonmagick/pythonmagick-0.8-r1.ebuild (renamed from dev-python/pythonmagick/pythonmagick-0.8.ebuild)9
3 files changed, 12 insertions, 21 deletions
diff --git a/dev-python/pythonmagick/ChangeLog b/dev-python/pythonmagick/ChangeLog
index 03bb9662b91e..e763f5ed87b8 100644
--- a/dev-python/pythonmagick/ChangeLog
+++ b/dev-python/pythonmagick/ChangeLog
@@ -1,6 +1,13 @@
# 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.15 2009/01/16 13:09:48 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/ChangeLog,v 1.16 2009/01/23 17:49:54 bicatali Exp $
+
+*pythonmagick-0.8-r1 (23 Jan 2009)
+
+ 23 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org>
+ -files/pythonmagick-0.8-as-needed.patch, -pythonmagick-0.8.ebuild,
+ +pythonmagick-0.8-r1.ebuild:
+ Upstream changed, and export boost_python to fix bug #255615#
*pythonmagick-0.8 (16 Jan 2009)
diff --git a/dev-python/pythonmagick/files/pythonmagick-0.8-as-needed.patch b/dev-python/pythonmagick/files/pythonmagick-0.8-as-needed.patch
deleted file mode 100644
index 0911fc43ea0c..000000000000
--- a/dev-python/pythonmagick/files/pythonmagick-0.8-as-needed.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.am.orig 2009-01-16 10:31:46.177792880 +0000
-+++ Makefile.am 2009-01-16 10:31:21.412531252 +0000
-@@ -17,10 +17,9 @@
- nodist_EXTRA__PythonMagick_la_SOURCES = dummy.cpp
-
- # Flags are always good to have
--_PythonMagick_la_LDFLAGS = -avoid-version -module $(BOOST_LDFLAGS) $(BOOST_PYTHON_LIBS) $(MAGICKPP_LIBS) $(MAGICK_LIBS) -l$(PYTHON_LIB)
-+_PythonMagick_la_LDFLAGS = -avoid-version -module
-
- # And the libraries to include
--_PythonMagick_la_LIBADD = pythonmagick_src/libpymagick.la \
-- helpers_src/libhelper.la
-+_PythonMagick_la_LIBADD = pythonmagick_src/libpymagick.la helpers_src/libhelper.la -l$(BOOST_PYTHON_LIB) $(BOOST_LDFLAGS) $(MAGICKPP_LIBS) $(MAGICK_LIBS) -l$(PYTHON_LIB)
-
- EXTRA_DIST = autogen.pl SConstruct pyste_src
diff --git a/dev-python/pythonmagick/pythonmagick-0.8.ebuild b/dev-python/pythonmagick/pythonmagick-0.8-r1.ebuild
index 8d331dec0018..53f18fb87a4c 100644
--- a/dev-python/pythonmagick/pythonmagick-0.8.ebuild
+++ b/dev-python/pythonmagick/pythonmagick-0.8-r1.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.ebuild,v 1.1 2009/01/16 13:09:48 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/pythonmagick-0.8-r1.ebuild,v 1.1 2009/01/23 17:49:54 bicatali Exp $
NEED_PYTHON=2.5
EAPI=2
-inherit python flag-o-matic autotools
+inherit python flag-o-matic
MY_PN=PythonMagick
MY_P=${MY_PN}-${PV}
@@ -26,10 +26,9 @@ DEPEND="${RDEPEND}
PYTHON_MODNAME="${MY_PN}"
S="${WORKDIR}/${MY_P}"
-src_prepare() {
- epatch "${FILESDIR}"/${P}-as-needed.patch
- AT_M4DIR="m4" eautoreconf
+pkg_setup() {
append-flags $(python-config --includes)
+ export BOOST_PYTHON="boost_python"
}
src_install() {