* [gentoo-commits] proj/sci:master commit in: dev-python/pysparse/
@ 2013-05-06 8:26 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2013-05-06 8:26 UTC (permalink / raw
To: gentoo-commits
commit: a08a440a3820a39f75b92c61661748cc81689866
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon May 6 08:19:33 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon May 6 08:19:33 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a08a440a
dev-python/pysparse: Fix for correct blas/lapack usage, #468708
Package-Manager: portage-2.2.0_alpha174
---
dev-python/pysparse/ChangeLog | 8 +++-
dev-python/pysparse/metadata.xml | 4 +-
dev-python/pysparse/pysparse-1.1.1-r1.ebuild | 59 ++++++++++++++++++++++++++
dev-python/pysparse/pysparse-1.1.1.ebuild | 53 -----------------------
dev-python/pysparse/pysparse-1.1.ebuild | 53 -----------------------
5 files changed, 68 insertions(+), 109 deletions(-)
diff --git a/dev-python/pysparse/ChangeLog b/dev-python/pysparse/ChangeLog
index 7b5fae0..d441e3f 100644
--- a/dev-python/pysparse/ChangeLog
+++ b/dev-python/pysparse/ChangeLog
@@ -1,7 +1,13 @@
# ChangeLog for dev-python/pysparse
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*pysparse-1.1.1-r1 (06 May 2013)
+
+ 06 May 2013; Justin Lecher <jlec@gentoo.org> -pysparse-1.1.ebuild,
+ -pysparse-1.1.1.ebuild, +pysparse-1.1.1-r1.ebuild, metadata.xml:
+ Fix for correct blas/lapack usage, #468708
+
*pysparse-1.1.1 (20 Jul 2010)
20 Jul 2010; Justin Lecher <jlec@gentoo.org> pysparse-1.1.ebuild,
diff --git a/dev-python/pysparse/metadata.xml b/dev-python/pysparse/metadata.xml
index b4cb18f..84d8350 100644
--- a/dev-python/pysparse/metadata.xml
+++ b/dev-python/pysparse/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+ <herd>sci</herd>
+ <longdescription lang="en">
This provides a set of sparse matrix types for Python, with modules
which implement:
- Iterative methods for solving linear systems of equations
diff --git a/dev-python/pysparse/pysparse-1.1.1-r1.ebuild b/dev-python/pysparse/pysparse-1.1.1-r1.ebuild
new file mode 100644
index 0000000..7638a14
--- /dev/null
+++ b/dev-python/pysparse/pysparse-1.1.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1 multilib
+
+DESCRIPTION="Sparse linear algebra extension for Python"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://pysparse.sourceforge.net/"
+
+IUSE="doc examples"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD"
+
+RDEPEND="
+ dev-python/numpy
+ sci-libs/superlu
+ <=sci-libs/umfpack-5.4.0"
+DEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-setup.patch
+ "${FILESDIR}"/${P}-superlu3.patch
+ )
+
+pc_libdir() {
+ $(tc-getPKG_CONFIG) --libs-only-L $@ | \
+ sed -e 's/^-L//' -e 's/[ ]*-L/:/g'
+}
+
+python_prepare_all() {
+ sed \
+ -e "/libraries_list/s:'lapack', 'blas':$(pc_libs blas lapack):g" \
+ -i setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ for t in Test/test{Umfpack,Superlu}.py; do
+ ${PYTHON} ${t} || die
+ done
+}
+
+python_install_all() {
+ distutils-r1_python_install
+
+ use doc && dodoc Doc/*.pdf
+
+ if use examples; then
+ insinto /usr/share/${PN}/
+ doins -r Examples
+ fi
+}
diff --git a/dev-python/pysparse/pysparse-1.1.1.ebuild b/dev-python/pysparse/pysparse-1.1.1.ebuild
deleted file mode 100644
index 877eb00..0000000
--- a/dev-python/pysparse/pysparse-1.1.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils eutils
-
-DESCRIPTION="Sparse linear algebra extension for Python"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://pysparse.sourceforge.net/"
-
-IUSE="doc examples"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="BSD"
-
-RDEPEND="
- dev-python/numpy
- sci-libs/superlu
- <=sci-libs/umfpack-5.4.0"
-DEPEND="${DEPEND}"
-
-RESTRICT_PYTHON_ABIS="3.*"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-setup.patch
- epatch "${FILESDIR}"/${P}-superlu3.patch
-}
-
-src_test() {
- testing() {
- for t in Test/test{Umfpack,Superlu}.py; do
- PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" ${t}
- done
- }
- python_execute_function testing
-}
-
-src_install() {
- distutils_src_install
- if use doc; then
- insinto /usr/share/doc/${PF}
- doins Doc/*.pdf || die
- fi
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins Examples/* || die
- fi
-}
diff --git a/dev-python/pysparse/pysparse-1.1.ebuild b/dev-python/pysparse/pysparse-1.1.ebuild
deleted file mode 100644
index 877eb00..0000000
--- a/dev-python/pysparse/pysparse-1.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils eutils
-
-DESCRIPTION="Sparse linear algebra extension for Python"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://pysparse.sourceforge.net/"
-
-IUSE="doc examples"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="BSD"
-
-RDEPEND="
- dev-python/numpy
- sci-libs/superlu
- <=sci-libs/umfpack-5.4.0"
-DEPEND="${DEPEND}"
-
-RESTRICT_PYTHON_ABIS="3.*"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-setup.patch
- epatch "${FILESDIR}"/${P}-superlu3.patch
-}
-
-src_test() {
- testing() {
- for t in Test/test{Umfpack,Superlu}.py; do
- PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" ${t}
- done
- }
- python_execute_function testing
-}
-
-src_install() {
- distutils_src_install
- if use doc; then
- insinto /usr/share/doc/${PF}
- doins Doc/*.pdf || die
- fi
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins Examples/* || die
- fi
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/sci:master commit in: dev-python/pysparse/
@ 2013-05-06 8:26 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2013-05-06 8:26 UTC (permalink / raw
To: gentoo-commits
commit: 2eff40f1092b99e188e6ceca733e0abb39f71c5f
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon May 6 08:26:33 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon May 6 08:26:33 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2eff40f1
dev-python/pysparse: USe internal umfpack due to incompatibility with latest umfpack from tree
Package-Manager: portage-2.2.0_alpha174
---
dev-python/pysparse/ChangeLog | 3 +++
dev-python/pysparse/pysparse-1.1.1-r1.ebuild | 11 ++++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/dev-python/pysparse/ChangeLog b/dev-python/pysparse/ChangeLog
index d441e3f..189c671 100644
--- a/dev-python/pysparse/ChangeLog
+++ b/dev-python/pysparse/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 06 May 2013; Justin Lecher <jlec@gentoo.org> pysparse-1.1.1-r1.ebuild:
+ USe internal umfpack due to incompatibility with latest umfpack from tree
+
*pysparse-1.1.1-r1 (06 May 2013)
06 May 2013; Justin Lecher <jlec@gentoo.org> -pysparse-1.1.ebuild,
diff --git a/dev-python/pysparse/pysparse-1.1.1-r1.ebuild b/dev-python/pysparse/pysparse-1.1.1-r1.ebuild
index 7638a14..7eac3e2 100644
--- a/dev-python/pysparse/pysparse-1.1.1-r1.ebuild
+++ b/dev-python/pysparse/pysparse-1.1.1-r1.ebuild
@@ -28,17 +28,18 @@ PATCHES=(
"${FILESDIR}"/${P}-superlu3.patch
)
-pc_libdir() {
- $(tc-getPKG_CONFIG) --libs-only-L $@ | \
- sed -e 's/^-L//' -e 's/[ ]*-L/:/g'
+pc_libs() {
+ $(tc-getPKG_CONFIG) --libs-only-l $@ | \
+ sed -e 's/[ ]-l*\(pthread\|m\)[ ]*//g' \
+ -e 's/^-l/"/' -e 's/[ ]*-l/","/g' -e 's/[ ]*$/"/g'
}
python_prepare_all() {
+ distutils-r1_python_prepare_all
sed \
-e "/libraries_list/s:'lapack', 'blas':$(pc_libs blas lapack):g" \
+ -e "/use_users_umfpack/s:True:False:g" \
-i setup.py || die
-
- distutils-r1_python_prepare_all
}
python_test() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-05-06 8:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-06 8:26 [gentoo-commits] proj/sci:master commit in: dev-python/pysparse/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2013-05-06 8:26 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox