| 1 |
bicatali 13/08/27 18:29:10 |
| 2 |
|
| 3 |
Modified: numpy-1.7.1.ebuild ChangeLog |
| 4 |
Removed: numpy-1.7.0.ebuild |
| 5 |
Log: |
| 6 |
Remove trailing spaces from pkg-config calls (bug #444104), fix shared lib extension (upstream patch) for python-3 (bug #470946), remove old |
| 7 |
|
| 8 |
(Portage version: 2.2.01.22288-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 dev-python/numpy/numpy-1.7.1.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.7.1.ebuild?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.7.1.ebuild?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.7.1.ebuild?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: numpy-1.7.1.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.7.1.ebuild,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- numpy-1.7.1.ebuild 16 Apr 2013 08:58:35 -0000 1.1 |
| 24 |
+++ numpy-1.7.1.ebuild 27 Aug 2013 18:29:10 -0000 1.2 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2013 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.7.1.ebuild,v 1.1 2013/04/16 08:58:35 patrick Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.7.1.ebuild,v 1.2 2013/08/27 18:29:10 bicatali Exp $ |
| 30 |
|
| 31 |
EAPI=5 |
| 32 |
|
| 33 |
@@ -48,22 +48,24 @@ |
| 34 |
|
| 35 |
pc_incdir() { |
| 36 |
$(tc-getPKG_CONFIG) --cflags-only-I $@ | \ |
| 37 |
- sed -e 's/^-I//' -e 's/[ ]*-I/:/g' |
| 38 |
+ sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' |
| 39 |
} |
| 40 |
|
| 41 |
pc_libdir() { |
| 42 |
$(tc-getPKG_CONFIG) --libs-only-L $@ | \ |
| 43 |
- sed -e 's/^-L//' -e 's/[ ]*-L/:/g' |
| 44 |
+ sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' |
| 45 |
} |
| 46 |
|
| 47 |
pc_libs() { |
| 48 |
$(tc-getPKG_CONFIG) --libs-only-l $@ | \ |
| 49 |
sed -e 's/[ ]-l*\(pthread\|m\)[ ]*//g' \ |
| 50 |
- -e 's/^-l//' -e 's/[ ]*-l/,/g' |
| 51 |
+ -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' |
| 52 |
} |
| 53 |
|
| 54 |
python_prepare_all() { |
| 55 |
epatch "${FILESDIR}"/${PN}-1.7.0-atlas.patch |
| 56 |
+ # applied upstream |
| 57 |
+ epatch "${FILESDIR}"/${PN}-1.7.1-distutils-python33.patch |
| 58 |
|
| 59 |
if use lapack; then |
| 60 |
append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)" |
| 61 |
@@ -118,16 +120,14 @@ |
| 62 |
distutils_install_for_testing ${NUMPY_FCONFIG} |
| 63 |
|
| 64 |
cd "${TMPDIR}" || die |
| 65 |
- "${PYTHON}" -c " |
| 66 |
+ ${EPYTHON} -c " |
| 67 |
import numpy, sys |
| 68 |
-r = numpy.test() |
| 69 |
+r = numpy.test(verbose=3) |
| 70 |
sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}" |
| 71 |
} |
| 72 |
|
| 73 |
python_install() { |
| 74 |
distutils-r1_python_install ${NUMPY_FCONFIG} |
| 75 |
- |
| 76 |
- rm -f "${D}"$(python_get_sitedir)/numpy/*.txt |
| 77 |
} |
| 78 |
|
| 79 |
python_install_all() { |
| 80 |
@@ -140,8 +140,8 @@ |
| 81 |
doman numpy/f2py/f2py.1 |
| 82 |
|
| 83 |
if use doc; then |
| 84 |
+ dohtml -r "${WORKDIR}"/html/* |
| 85 |
insinto /usr/share/doc/${PF} |
| 86 |
- doins -r "${WORKDIR}"/html |
| 87 |
doins "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf |
| 88 |
fi |
| 89 |
} |
| 90 |
|
| 91 |
|
| 92 |
|
| 93 |
1.203 dev-python/numpy/ChangeLog |
| 94 |
|
| 95 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?rev=1.203&view=markup |
| 96 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?rev=1.203&content-type=text/plain |
| 97 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?r1=1.202&r2=1.203 |
| 98 |
|
| 99 |
Index: ChangeLog |
| 100 |
=================================================================== |
| 101 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v |
| 102 |
retrieving revision 1.202 |
| 103 |
retrieving revision 1.203 |
| 104 |
diff -u -r1.202 -r1.203 |
| 105 |
--- ChangeLog 16 Apr 2013 08:58:35 -0000 1.202 |
| 106 |
+++ ChangeLog 27 Aug 2013 18:29:10 -0000 1.203 |
| 107 |
@@ -1,6 +1,12 @@ |
| 108 |
# ChangeLog for dev-python/numpy |
| 109 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 110 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.202 2013/04/16 08:58:35 patrick Exp $ |
| 111 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.203 2013/08/27 18:29:10 bicatali Exp $ |
| 112 |
+ |
| 113 |
+ 27 Aug 2013; Sébastien Fabbro <bicatali@g.o> |
| 114 |
+ +files/numpy-1.7.1-distutils-python33.patch, -numpy-1.7.0.ebuild, |
| 115 |
+ numpy-1.7.1.ebuild: |
| 116 |
+ Remove trailing spaces from pkg-config calls (bug #444104), fix shared lib |
| 117 |
+ extension (upstream patch) for python-3 (bug #470946), remove old |
| 118 |
|
| 119 |
*numpy-1.7.1 (16 Apr 2013) |
Archives