* [gentoo-commits] gentoo-x86 commit in dev-python/matplotlib: matplotlib-1.2.0.ebuild ChangeLog
@ 2012-11-29 10:03 Ian Delaney (idella4)
0 siblings, 0 replies; 2+ messages in thread
From: Ian Delaney (idella4) @ 2012-11-29 10:03 UTC (permalink / raw
To: gentoo-commits
idella4 12/11/29 10:03:01
Modified: ChangeLog
Added: matplotlib-1.2.0.ebuild
Log:
bump to 1.2.0, test phase upgraded, new ft-refcount.patch from upstream, python3 support but for USE doc requiring special treatment, ack to users Nicolas Bigaouette and Rafal Muzylo for patches in entered in Bug #443836
(Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Revision Changes Path
1.128 dev-python/matplotlib/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/ChangeLog?rev=1.128&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/ChangeLog?rev=1.128&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/ChangeLog?r1=1.127&r2=1.128
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- ChangeLog 26 Nov 2012 06:21:01 -0000 1.127
+++ ChangeLog 29 Nov 2012 10:03:01 -0000 1.128
@@ -1,6 +1,15 @@
# ChangeLog for dev-python/matplotlib
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.127 2012/11/26 06:21:01 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.128 2012/11/29 10:03:01 idella4 Exp $
+
+*matplotlib-1.2.0 (30 Nov 2012)
+
+ 30 Nov 2012; Ian Delaney <idella4@gentoo.org>
+ +files/matplotlib-1.2.0-ft-refcount.patch,
+ +files/matplotlib-1.2.0-setup.patch, +matplotlib-1.2.0.ebuild:
+ bump to 1.2.0, test phase upgraded, new ft-refcount.patch from upstream,
+ python3 support but for USE doc requiring special treatment, ack to users
+ Nicolas Bigaouette and Rafal Muzylo for patches in entered in Bug #443836
26 Nov 2012; Ian Delaney <idella4@gentoo.org>
files/matplotlib-1.1.1-ft-refcount.patch, matplotlib-1.1.1.ebuild:
1.1 dev-python/matplotlib/matplotlib-1.2.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/matplotlib-1.2.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/matplotlib-1.2.0.ebuild?rev=1.1&content-type=text/plain
Index: matplotlib-1.2.0.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.2.0.ebuild,v 1.1 2012/11/29 10:03:01 idella4 Exp $
EAPI="3"
PYTHON_DEPEND="*:2.6"
PYTHON_USE_WITH="tk"
PYTHON_USE_WITH_OPT="tk"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
PYTHON_TESTS_RESTRICTED_ABIS="2.[56] 3.1"
PYTHON_CFLAGS=("2.* + -fno-strict-aliasing" "3.* + -fno-strict-aliasing")
PYTHON_CXXFLAGS=("2.* + -fno-strict-aliasing" "3.* + -fno-strict-aliasing")
PYTHON_MODNAME="matplotlib mpl_toolkits pylab.py"
WX_GTK_VER="2.8"
inherit distutils eutils
DESCRIPTION="Pure python plotting library with matlab like syntax"
HOMEPAGE="http://matplotlib.org/ http://pypi.python.org/pypi/matplotlib"
SRC_URI="https://github.com/downloads/${PN}/${PN}/${P}.tar.gz"
IUSE="cairo doc excel examples fltk gtk latex qt4 test tk wxwidgets"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
# Main license: matplotlib
# Some modules: BSD
# matplotlib/backends/qt4_editor: MIT
# Fonts: BitstreamVera, OFL-1.1
LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
CDEPEND="dev-python/numpy
dev-python/python-dateutil
dev-python/pytz
media-libs/freetype:2
media-libs/libpng
gtk? ( dev-python/pygtk
|| ( >=dev-lang/python-3.2 dev-python/pygtk:3 ) )
wxwidgets? ( dev-python/wxpython:2.8 )"
# internal copy of pycxx highly patched
# dev-python/pycxx
DEPEND="${CDEPEND}
virtual/pkgconfig
doc? (
app-text/dvipng
dev-python/imaging
dev-python/ipython
dev-python/xlwt
dev-python/sphinx
dev-texlive/texlive-latexextra
dev-texlive/texlive-fontsrecommended
dev-texlive/texlive-latexrecommended
media-gfx/graphviz[cairo]
)
test? ( dev-python/nose )"
RDEPEND="${CDEPEND}
dev-python/pyparsing
cairo? ( dev-python/pycairo )
excel? ( dev-python/xlwt )
fltk? ( dev-python/pyfltk )
latex? (
virtual/latex-base
app-text/ghostscript-gpl
app-text/dvipng
app-text/poppler[utils]
dev-texlive/texlive-fontsrecommended
)
qt4? ( || ( dev-python/PyQt4[X] dev-python/pyside[X] ) )"
RESTRICT="mirror"
use_setup() {
local uword="${2:-${1}}"
if use ${1}; then
echo "${uword} = True"
echo "${uword}agg = True"
else
echo "${uword} = False"
echo "${uword}agg = False"
fi
}
src_prepare() {
# create setup.cfg (see setup.cfg.template for any changes)
cat > setup.cfg <<-EOF
[provide_packages]
pytz = False
dateutil = False
six = False
[gui_support]
$(use_setup cairo)
$(use_setup fltk)
$(use_setup gtk)
$(use_setup qt4)
$(use_setup tk)
$(use_setup wxwidgets wx)
EOF
# avoid checks needing a X display
epatch "${FILESDIR}"/${P}-setup.patch
# Fix test, issue no. 1532
epatch "${FILESDIR}"/${P}-ft-refcount.patch
# remove internal copies of pyparsing
rm lib/matplotlib/pyparsing{_py2,_py3}.py || die
sed -i -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
lib/matplotlib/{mathtext,fontconfig_pattern}.py \
|| die "sed pyparsing failed"
DocCheck() {
if [[ "$(python_get_version --major)" == '3' ]]; then
eerror ""
eerror "Building of docs with python3 currently **FAILS**"
eerror "Docs can be built effectively with python2."
eerror "Prepend USE_PYTHON=2.7 and recommence emerge "
eerror ""
die
fi
}
python_execute_function DocCheck
distutils_src_prepare
}
src_compile() {
unset DISPLAY # bug #278524
distutils_src_compile
if use doc; then
pushd doc > /dev/null
VARTEXFONTS="${T}"/fonts \
PYTHONPATH=$(ls -d "${S}"/build-$(PYTHON -f --ABI)/lib*) \
./make.py --small all
[[ -e build/latex/Matplotlib.pdf ]] || die "doc generation failed"
popd > /dev/null
fi
}
src_test() {
# if doc was enabled, all examples were built and tested
use doc && return
testing() {
"$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" install \
--home="${S}/test-${PYTHON_ABI}" --no-compile \
|| die "install test failed"
pushd "${S}/test-${PYTHON_ABI}/"lib* > /dev/null
PYTHONPATH=python \
"$(PYTHON)" -c "import matplotlib as m; m.test(verbosity=2)" \
2>&1 | tee test.log
grep -Eq "^(ERROR|FAIL):" test.log && return 1
popd > /dev/null
rm -r test-${PYTHON_ABI}
}
python_execute_function testing
}
src_install() {
distutils_src_install
if use doc; then
insinto /usr/share/doc/${PF}
doins -r doc/build/latex/Matplotlib.pdf doc/build/html || die
fi
if use examples; then
insinto /usr/share/doc/${PF}
doins -r examples || die
fi
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-python/matplotlib: matplotlib-1.2.0.ebuild ChangeLog
@ 2012-11-29 15:32 Ian Delaney (idella4)
0 siblings, 0 replies; 2+ messages in thread
From: Ian Delaney (idella4) @ 2012-11-29 15:32 UTC (permalink / raw
To: gentoo-commits
idella4 12/11/29 15:32:08
Modified: matplotlib-1.2.0.ebuild ChangeLog
Log:
Correction to DocCheck to doc check
(Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Revision Changes Path
1.2 dev-python/matplotlib/matplotlib-1.2.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/matplotlib-1.2.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/matplotlib-1.2.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/matplotlib-1.2.0.ebuild?r1=1.1&r2=1.2
Index: matplotlib-1.2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.2.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- matplotlib-1.2.0.ebuild 29 Nov 2012 10:03:01 -0000 1.1
+++ matplotlib-1.2.0.ebuild 29 Nov 2012 15:32:08 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.2.0.ebuild,v 1.1 2012/11/29 10:03:01 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.2.0.ebuild,v 1.2 2012/11/29 15:32:08 idella4 Exp $
EAPI="3"
@@ -115,11 +115,11 @@
|| die "sed pyparsing failed"
DocCheck() {
- if [[ "$(python_get_version --major)" == '3' ]]; then
+ if [[ "$(python_get_version --major)" == '3' ]] && use doc; then
eerror ""
eerror "Building of docs with python3 currently **FAILS**"
eerror "Docs can be built effectively with python2."
- eerror "Prepend USE_PYTHON=2.7 and recommence emerge "
+ eerror "eselect python2 and recommence emerge "
eerror ""
die
fi
@@ -170,3 +170,4 @@
doins -r examples || die
fi
}
+
1.129 dev-python/matplotlib/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/ChangeLog?rev=1.129&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/ChangeLog?rev=1.129&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/ChangeLog?r1=1.128&r2=1.129
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- ChangeLog 29 Nov 2012 10:03:01 -0000 1.128
+++ ChangeLog 29 Nov 2012 15:32:08 -0000 1.129
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/matplotlib
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.128 2012/11/29 10:03:01 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.129 2012/11/29 15:32:08 idella4 Exp $
+
+ 30 Nov 2012; Ian Delaney <idella4@gentoo.org> matplotlib-1.2.0.ebuild:
+ Correction to DocCheck to doc check
*matplotlib-1.2.0 (30 Nov 2012)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-11-29 15:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-29 15:32 [gentoo-commits] gentoo-x86 commit in dev-python/matplotlib: matplotlib-1.2.0.ebuild ChangeLog Ian Delaney (idella4)
-- strict thread matches above, loose matches on Subject: below --
2012-11-29 10:03 Ian Delaney (idella4)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox