From ed786672c71b8c5f2374803f1e052b1ec799d3e6 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Sun, 28 Feb 2010 12:38:38 +0000 Subject: [PATCH] Set PYTHON_EXPORT_PHASE_FUNCTIONS instead of PYTHON_DEFINE_DEFAULT_FUNCTIONS. Package-Manager: portage-15497-svn/cvs/Linux x86_64 --- dev-python/PyQt4/PyQt4-4.7.ebuild | 6 +++--- dev-python/pyqwt/pyqwt-5.2.0.ebuild | 4 ++-- dev-python/python-poppler/python-poppler-0.10.1.ebuild | 6 +++--- dev-python/python-poppler/python-poppler-0.12.1.ebuild | 6 +++--- dev-python/pywebkitgtk/pywebkitgtk-1.1.6-r1.ebuild | 9 +++------ dev-python/pywebkitgtk/pywebkitgtk-1.1.7.ebuild | 4 ++-- 6 files changed, 16 insertions(+), 19 deletions(-) diff --git a/dev-python/PyQt4/PyQt4-4.7.ebuild b/dev-python/PyQt4/PyQt4-4.7.ebuild index 0aa8906351b4..1dfea0fc7da1 100644 --- a/dev-python/PyQt4/PyQt4-4.7.ebuild +++ b/dev-python/PyQt4/PyQt4-4.7.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.ebuild,v 1.2 2010/01/20 00:13:26 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.ebuild,v 1.3 2010/02/28 12:31:17 arfrever Exp $ EAPI="2" -PYTHON_DEFINE_DEFAULT_FUNCTIONS="1" +PYTHON_EXPORT_PHASE_FUNCTIONS="1" SUPPORT_PYTHON_ABIS="1" inherit qt4-r2 python toolchain-funcs @@ -136,7 +136,7 @@ src_configure() { } src_compile() { - python_execute_function -d -s + python_src_compile } src_install() { diff --git a/dev-python/pyqwt/pyqwt-5.2.0.ebuild b/dev-python/pyqwt/pyqwt-5.2.0.ebuild index 38f2c567eedc..62ae9f7c86d8 100644 --- a/dev-python/pyqwt/pyqwt-5.2.0.ebuild +++ b/dev-python/pyqwt/pyqwt-5.2.0.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyqwt/pyqwt-5.2.0.ebuild,v 1.4 2010/02/07 03:07:41 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyqwt/pyqwt-5.2.0.ebuild,v 1.5 2010/02/28 12:33:09 arfrever Exp $ EAPI="2" PYTHON_DEPEND="2" SUPPORT_PYTHON_ABIS="1" -PYTHON_DEFINE_DEFAULT_FUNCTIONS="1" +PYTHON_EXPORT_PHASE_FUNCTIONS="1" inherit flag-o-matic python diff --git a/dev-python/python-poppler/python-poppler-0.10.1.ebuild b/dev-python/python-poppler/python-poppler-0.10.1.ebuild index 19750c656da5..550b6217b5ac 100644 --- a/dev-python/python-poppler/python-poppler-0.10.1.ebuild +++ b/dev-python/python-poppler/python-poppler-0.10.1.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/python-poppler/python-poppler-0.10.1.ebuild,v 1.3 2010/02/10 14:32:52 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/python-poppler/python-poppler-0.10.1.ebuild,v 1.4 2010/02/28 12:35:49 arfrever Exp $ EAPI="2" -NEED_PYTHON="2.6" -PYTHON_DEFINE_DEFAULT_FUNCTIONS="1" +PYTHON_DEPEND="2:2.6" +PYTHON_EXPORT_PHASE_FUNCTIONS="1" SUPPORT_PYTHON_ABIS="1" inherit libtool python diff --git a/dev-python/python-poppler/python-poppler-0.12.1.ebuild b/dev-python/python-poppler/python-poppler-0.12.1.ebuild index dd4bd8852d57..c00c0abe3733 100644 --- a/dev-python/python-poppler/python-poppler-0.12.1.ebuild +++ b/dev-python/python-poppler/python-poppler-0.12.1.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/python-poppler/python-poppler-0.12.1.ebuild,v 1.2 2010/02/10 14:32:52 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/python-poppler/python-poppler-0.12.1.ebuild,v 1.3 2010/02/28 12:35:49 arfrever Exp $ EAPI="2" -NEED_PYTHON="2.6" -PYTHON_DEFINE_DEFAULT_FUNCTIONS="1" +PYTHON_DEPEND="2:2.6" +PYTHON_EXPORT_PHASE_FUNCTIONS="1" SUPPORT_PYTHON_ABIS="1" inherit libtool python diff --git a/dev-python/pywebkitgtk/pywebkitgtk-1.1.6-r1.ebuild b/dev-python/pywebkitgtk/pywebkitgtk-1.1.6-r1.ebuild index 9565d93fddcd..4ccccbbbe553 100644 --- a/dev-python/pywebkitgtk/pywebkitgtk-1.1.6-r1.ebuild +++ b/dev-python/pywebkitgtk/pywebkitgtk-1.1.6-r1.ebuild @@ -1,11 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pywebkitgtk/pywebkitgtk-1.1.6-r1.ebuild,v 1.8 2010/02/21 17:18:37 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pywebkitgtk/pywebkitgtk-1.1.6-r1.ebuild,v 1.9 2010/02/28 12:38:38 arfrever Exp $ EAPI="2" - -NEED_PYTHON="2.4" -PYTHON_DEFINE_DEFAULT_FUNCTIONS="1" +PYTHON_EXPORT_PHASE_FUNCTIONS="1" SUPPORT_PYTHON_ABIS="1" inherit autotools python @@ -27,8 +25,7 @@ RDEPEND="dev-python/pygobject:2 >=net-libs/webkit-gtk-1.1.5" DEPEND="${RDEPEND} dev-util/pkgconfig" - -RESTRICT_PYTHON_ABIS="3*" +RESTRICT_PYTHON_ABIS="3.*" src_prepare() { sed -e "s:libxslt,:libxslt, gthread-2.0:" -i configure.ac diff --git a/dev-python/pywebkitgtk/pywebkitgtk-1.1.7.ebuild b/dev-python/pywebkitgtk/pywebkitgtk-1.1.7.ebuild index 333cd2de9a10..ce60b9203693 100644 --- a/dev-python/pywebkitgtk/pywebkitgtk-1.1.7.ebuild +++ b/dev-python/pywebkitgtk/pywebkitgtk-1.1.7.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pywebkitgtk/pywebkitgtk-1.1.7.ebuild,v 1.3 2010/01/27 12:23:01 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pywebkitgtk/pywebkitgtk-1.1.7.ebuild,v 1.4 2010/02/28 12:38:38 arfrever Exp $ EAPI="2" -PYTHON_DEFINE_DEFAULT_FUNCTIONS="1" +PYTHON_EXPORT_PHASE_FUNCTIONS="1" SUPPORT_PYTHON_ABIS="1" inherit python -- 2.26.2