| 1 |
jlec 13/12/26 19:01:54 |
| 2 |
|
| 3 |
Modified: matplotlib-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
dev-python/matplotlib: Propagate changes into live ebuild |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-python/matplotlib/matplotlib-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/matplotlib-9999.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/matplotlib-9999.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/matplotlib-9999.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: matplotlib-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-9999.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- matplotlib-9999.ebuild 12 Dec 2013 14:30:20 -0000 1.1 |
| 23 |
+++ matplotlib-9999.ebuild 26 Dec 2013 19:01:54 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-9999.ebuild,v 1.1 2013/12/12 14:30:20 jlec Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-9999.ebuild,v 1.2 2013/12/26 19:01:54 jlec Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
@@ -8,6 +8,8 @@ |
| 33 |
|
| 34 |
PYTHON_REQ_USE='tk?' |
| 35 |
|
| 36 |
+VIRTUALX_REQUIRED="always" |
| 37 |
+ |
| 38 |
inherit distutils-r1 eutils flag-o-matic git-r3 virtualx |
| 39 |
|
| 40 |
DESCRIPTION="Pure python plotting library with matlab like syntax" |
| 41 |
@@ -75,7 +77,7 @@ |
| 42 |
dev-texlive/texlive-latexextra |
| 43 |
dev-texlive/texlive-xetex |
| 44 |
) |
| 45 |
- pyside? ( dev-python/pyside[X,${PY2_USEDEP},${PY32_USEDEP}] ) |
| 46 |
+ pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] ) |
| 47 |
qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )" |
| 48 |
|
| 49 |
PY2_FLAGS="|| ( $(python_gen_useflags python2*) )" |
| 50 |
@@ -85,7 +87,6 @@ |
| 51 |
excel? ( ${PY2_FLAGS} ) |
| 52 |
fltk? ( ${PY2_FLAGS} ) |
| 53 |
gtk? ( ${PY2_FLAGS} ) |
| 54 |
- pyside? ( ${PY2_FLAGS} ${PY32_FLAGS} ) |
| 55 |
wxwidgets? ( ${PY2_FLAGS} ) |
| 56 |
test? ( |
| 57 |
cairo fltk latex pyside qt4 tk wxwidgets |
| 58 |
@@ -110,6 +111,13 @@ |
| 59 |
} |
| 60 |
|
| 61 |
python_prepare_all() { |
| 62 |
+# Generates test failures, but fedora does it |
| 63 |
+# local PATCHES=( |
| 64 |
+# "${FILESDIR}"/${P}-unbundle-pycxx.patch |
| 65 |
+# "${FILESDIR}"/${P}-unbundle-agg.patch |
| 66 |
+# ) |
| 67 |
+# rm -r agg24 CXX || die |
| 68 |
+# rm -r agg24 || die |
| 69 |
sed \ |
| 70 |
-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \ |
| 71 |
-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \ |
| 72 |
@@ -120,6 +128,11 @@ |
| 73 |
-e '/tol/s:32:35:g' \ |
| 74 |
-i lib/matplotlib/tests/test_mathtext.py || die |
| 75 |
|
| 76 |
+ if use gtk || use gtk3; then |
| 77 |
+ export XDG_RUNTIME_DIR="${T}/runtime-dir" |
| 78 |
+ mkdir "${XDG_RUNTIME_DIR}" || die |
| 79 |
+ chmod 0700 "${XDG_RUNTIME_DIR}" || die |
| 80 |
+ fi |
| 81 |
distutils-r1_python_prepare_all |
| 82 |
} |
| 83 |
|
| 84 |
@@ -183,8 +196,8 @@ |
| 85 |
} |
| 86 |
|
| 87 |
python_compile() { |
| 88 |
- VIRTUALX_COMMAND="wrap_setup" |
| 89 |
- virtualmake distutils-r1_python_compile |
| 90 |
+ VIRTUALX_COMMAND="wrap_setup distutils-r1_python_compile" |
| 91 |
+ virtualmake |
| 92 |
} |
| 93 |
|
| 94 |
python_compile_all() { |
| 95 |
@@ -201,15 +214,12 @@ |
| 96 |
} |
| 97 |
|
| 98 |
python_test() { |
| 99 |
- VIRTUALX_COMMAND="wrap_setup" |
| 100 |
- virtualmake distutils_install_for_testing |
| 101 |
+ wrap_setup distutils_install_for_testing |
| 102 |
|
| 103 |
cd "${TMPDIR}" || die |
| 104 |
VIRTUALX_COMMAND="${PYTHON}" |
| 105 |
- virtualmake -c " |
| 106 |
-import sys, matplotlib as m |
| 107 |
-sys.exit(0 if m.test(verbosity=2) else 1) |
| 108 |
-" || die "Tests fail with ${EPYTHON}" |
| 109 |
+ virtualmake -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)" || \ |
| 110 |
+ die "Tests fail with ${EPYTHON}" |
| 111 |
} |
| 112 |
|
| 113 |
python_install() { |
| 114 |
|
| 115 |
|
| 116 |
|
| 117 |
1.164 dev-python/matplotlib/ChangeLog |
| 118 |
|
| 119 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/ChangeLog?rev=1.164&view=markup |
| 120 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/ChangeLog?rev=1.164&content-type=text/plain |
| 121 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/ChangeLog?r1=1.163&r2=1.164 |
| 122 |
|
| 123 |
Index: ChangeLog |
| 124 |
=================================================================== |
| 125 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v |
| 126 |
retrieving revision 1.163 |
| 127 |
retrieving revision 1.164 |
| 128 |
diff -u -r1.163 -r1.164 |
| 129 |
--- ChangeLog 26 Dec 2013 18:55:53 -0000 1.163 |
| 130 |
+++ ChangeLog 26 Dec 2013 19:01:54 -0000 1.164 |
| 131 |
@@ -1,6 +1,9 @@ |
| 132 |
# ChangeLog for dev-python/matplotlib |
| 133 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 134 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.163 2013/12/26 18:55:53 jlec Exp $ |
| 135 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.164 2013/12/26 19:01:54 jlec Exp $ |
| 136 |
+ |
| 137 |
+ 26 Dec 2013; Justin Lecher <jlec@g.o> matplotlib-9999.ebuild: |
| 138 |
+ Propagate changes into live ebuild |
| 139 |
|
| 140 |
26 Dec 2013; Justin Lecher <jlec@g.o> matplotlib-1.3.1.ebuild: |
| 141 |
Update deps for USE=pyside and fix sandbox problems for gtk+3 |
Archives