xarthisius 10/08/03 13:40:46
Modified: ChangeLog scipy-0.7.2-r1.ebuild scipy-0.8.0.ebuild
Log:
Apply upstream patches to fix build with python2.7. Fixes bug 321587
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.58 sci-libs/scipy/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/ChangeLog?rev=1.58&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/ChangeLog?rev=1.58&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/ChangeLog?r1=1.57&r2=1.58
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- ChangeLog 3 Aug 2010 11:45:54 -0000 1.57
+++ ChangeLog 3 Aug 2010 13:40:45 -0000 1.58
@@ -1,6 +1,11 @@
# ChangeLog for sci-libs/scipy
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.57 2010/08/03 11:45:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.58 2010/08/03 13:40:45 xarthisius Exp $
+
+ 03 Aug 2010; Kacper Kowalik <xarthisius@g.o> scipy-0.7.2-r1.ebuild,
+ +files/scipy-0.7.2-python2.7.patch, scipy-0.8.0.ebuild,
+ +files/scipy-0.8.0-python2.7.patch:
+ Apply upstream patches to fix build with python2.7. Fixes bug 321587
*scipy-0.8.0 (03 Aug 2010)
1.7 sci-libs/scipy/scipy-0.7.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/scipy-0.7.2-r1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/scipy-0.7.2-r1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/scipy-0.7.2-r1.ebuild?r1=1.6&r2=1.7
Index: scipy-0.7.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.7.2-r1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scipy-0.7.2-r1.ebuild 13 Jul 2010 17:04:16 -0000 1.6
+++ scipy-0.7.2-r1.ebuild 3 Aug 2010 13:40:45 -0000 1.7
@@ -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/sci-libs/scipy/scipy-0.7.2-r1.ebuild,v 1.6 2010/07/13 17:04:16 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.7.2-r1.ebuild,v 1.7 2010/08/03 13:40:45 xarthisius Exp $
EAPI="2"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.7 3.*"
+RESTRICT_PYTHON_ABIS="3.*"
inherit eutils distutils flag-o-matic toolchain-funcs versionator
@@ -72,7 +72,8 @@
epatch "${FILESDIR}"/${PN}-0.7.0_beta1-implicit.patch
epatch "${FILESDIR}"/${PN}-0.6.0-stsci.patch
epatch "${FILESDIR}"/${PN}-0.7.1-weave.patch
- epatch "${FILESDIR}"/${PN}-0.7.2-optimize.patch
+ epatch "${FILESDIR}"/${PN}-0.7.2-optimize.patch \
+ "${FILESDIR}"/${P}-python2.7.patch
local libdir="${EPREFIX}"/usr/$(get_libdir)
cat > site.cfg <<-EOF
[atlas]
1.2 sci-libs/scipy/scipy-0.8.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/scipy-0.8.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/scipy-0.8.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/scipy-0.8.0.ebuild?r1=1.1&r2=1.2
Index: scipy-0.8.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.8.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scipy-0.8.0.ebuild 3 Aug 2010 11:45:54 -0000 1.1
+++ scipy-0.8.0.ebuild 3 Aug 2010 13:40:45 -0000 1.2
@@ -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/sci-libs/scipy/scipy-0.8.0.ebuild,v 1.1 2010/08/03 11:45:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.8.0.ebuild,v 1.2 2010/08/03 13:40:45 xarthisius Exp $
EAPI="2"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.7 3.*"
+RESTRICT_PYTHON_ABIS="3.*"
inherit eutils distutils flag-o-matic toolchain-funcs versionator
@@ -68,7 +68,8 @@
}
src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.6.0-stsci.patch
+ epatch "${FILESDIR}"/${PN}-0.6.0-stsci.patch \
+ "${FILESDIR}"/${P}-python2.7.patch
local libdir="${EPREFIX}"/usr/$(get_libdir)
cat > site.cfg <<-EOF
[atlas]
|