xarthisius 15/02/24 16:19:16
Modified: matplotlib-9999.ebuild matplotlib-1.4.2.ebuild
ChangeLog
Added: matplotlib-1.4.3.ebuild
Log:
Version bump, append -DNDEBUG to cppflags
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key
0x5D21B852895192F9)
Revision Changes Path
1.7 dev-python/matplotlib/matplotlib-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/matplotlib-9999.ebuild?rev=1.7&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/matplotlib-9999.ebuild?rev=1.7&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/matplotlib-9999.ebuild?r1=1.6&r2=1.7
Index: matplotlib-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-9999.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- matplotlib-9999.ebuild 28 Nov 2014 10:50:34 -0000 1.6
+++ matplotlib-9999.ebuild 24 Feb 2015 16:19:16 -0000 1.7
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-9999.ebuild,v 1.6
2014/11/28 10:50:34 pacho Exp $
+# $Header:
/var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-9999.ebuild,v 1.7
2015/02/24 16:19:16 xarthisius Exp $
EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
PYTHON_REQ_USE='tk?'
@@ -135,6 +135,7 @@
python_configure_all() {
append-flags -fno-strict-aliasing
+ append-cppflags -DNDEBUG # or get old trying to do triangulation
}
python_configure() {
1.8 dev-python/matplotlib/matplotlib-1.4.2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/matplotlib-1.4.2.ebuild?rev=1.8&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/matplotlib-1.4.2.ebuild?rev=1.8&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/matplotlib-1.4.2.ebuild?r1=1.7&r2=1.8
Index: matplotlib-1.4.2.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.4.2.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- matplotlib-1.4.2.ebuild 22 Feb 2015 11:20:12 -0000 1.7
+++ matplotlib-1.4.2.ebuild 24 Feb 2015 16:19:16 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.4.2.ebuild,v 1.7
2015/02/22 11:20:12 mgorny Exp $
+# $Header:
/var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.4.2.ebuild,v 1.8
2015/02/24 16:19:16 xarthisius Exp $
EAPI=5
@@ -149,6 +149,7 @@
python_configure_all() {
append-flags -fno-strict-aliasing
+ append-cppflags -DNDEBUG # or get old trying to do triangulation
}
python_configure() {
1.183 dev-python/matplotlib/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/ChangeLog?rev=1.183&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/ChangeLog?rev=1.183&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/ChangeLog?r1=1.182&r2=1.183
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- ChangeLog 22 Feb 2015 11:20:12 -0000 1.182
+++ ChangeLog 24 Feb 2015 16:19:16 -0000 1.183
@@ -1,6 +1,12 @@
# ChangeLog for dev-python/matplotlib
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.182
2015/02/22 11:20:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.183
2015/02/24 16:19:16 xarthisius Exp $
+
+*matplotlib-1.4.3 (24 Feb 2015)
+
+ 24 Feb 2015; Kacper Kowalik <xarthis...@gentoo.org> +matplotlib-1.4.3.ebuild,
+ matplotlib-1.4.2.ebuild, matplotlib-9999.ebuild:
+ Version bump, append -DNDEBUG to cppflags
22 Feb 2015; Michał Górny <mgo...@gentoo.org> matplotlib-1.4.2.ebuild:
Restore arm, that one got ipython right.
1.1 dev-python/matplotlib/matplotlib-1.4.3.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/matplotlib-1.4.3.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/matplotlib-1.4.3.ebuild?rev=1.1&content-type=text/plain
Index: matplotlib-1.4.3.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header:
/var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.4.3.ebuild,v 1.1
2015/02/24 16:19:16 xarthisius Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
PYTHON_REQ_USE='tk?'
inherit distutils-r1 eutils flag-o-matic virtualx
DESCRIPTION="Pure python plotting library with matlab like syntax"
HOMEPAGE="http://matplotlib.org/";
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
SLOT="0"
# Main license: matplotlib
# Some modules: BSD
# matplotlib/backends/qt4_editor: MIT
# Fonts: BitstreamVera, OFL-1.1
LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos"
IUSE="cairo doc excel examples fltk gtk gtk3 latex pyside qt4 test tk wxwidgets"
# #456704 -- a lot of py2-only deps
PY2_USEDEP=$(python_gen_usedep python2_7)
COMMON_DEPEND="
>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
dev-python/python-dateutil:0[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
>=dev-python/six-1.4[${PYTHON_USEDEP}]
media-fonts/stix-fonts
>=media-libs/freetype-2.3
media-libs/libpng:0
media-libs/qhull
gtk? (
dev-libs/glib
x11-libs/gdk-pixbuf
x11-libs/gtk+:2
dev-python/pygtk[${PY2_USEDEP}] )
wxwidgets? ( >=dev-python/wxpython-2.8[${PY2_USEDEP}] )"
# internal copy of pycxx highly patched
# dev-python/pycxx
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
doc? (
app-text/dvipng
virtual/python-imaging[${PYTHON_USEDEP}]
dev-python/ipython[${PYTHON_USEDEP}]
dev-python/numpydoc[${PYTHON_USEDEP}]
dev-python/xlwt[${PY2_USEDEP}]
dev-python/sphinx[${PYTHON_USEDEP}]
dev-texlive/texlive-latexextra
dev-texlive/texlive-fontsrecommended
dev-texlive/texlive-latexrecommended
media-gfx/graphviz[cairo]
)
test? (
dev-python/mock[${PYTHON_USEDEP}]
>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
)"
RDEPEND="${COMMON_DEPEND}
>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
cairo? (
|| (
dev-python/pycairo[${PYTHON_USEDEP}]
dev-python/cairocffi[${PYTHON_USEDEP}]
)
)
excel? ( dev-python/xlwt[${PY2_USEDEP}] )
fltk? ( dev-python/pyfltk[${PY2_USEDEP}] )
gtk3? (
dev-python/pygobject:3[${PYTHON_USEDEP}]
x11-libs/gtk+:3[introspection] )
latex? (
virtual/latex-base
app-text/ghostscript-gpl
app-text/dvipng
app-text/poppler[utils]
dev-texlive/texlive-fontsrecommended
dev-texlive/texlive-latexextra
dev-texlive/texlive-xetex
)
pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )"
PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
REQUIRED_USE="
doc? ( ${PY2_FLAGS} )
excel? ( ${PY2_FLAGS} )
fltk? ( ${PY2_FLAGS} )
gtk? ( ${PY2_FLAGS} )
wxwidgets? ( ${PY2_FLAGS} )
test? (
cairo fltk latex pyside qt4 tk wxwidgets
|| ( gtk gtk3 )
)"
RESTRICT="mirror"
# A few C++ source files are written to srcdir.
# Other than that, the ebuild shall be fit for out-of-source build.
DISTUTILS_IN_SOURCE_BUILD=1
pkg_setup() {
unset DISPLAY # bug #278524
}
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
}
python_prepare_all() {
# Generates test failures, but fedora does it
# local PATCHES=(
# "${FILESDIR}"/${P}-unbundle-pycxx.patch
# "${FILESDIR}"/${P}-unbundle-agg.patch
# )
# rm -r agg24 CXX || die
# rm -r agg24 || die
sed \
-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
|| die "sed pyparsing failed"
# suggested by upstream
sed \
-e '/tol/s:32:35:g' \
-i lib/matplotlib/tests/test_mathtext.py || die
export XDG_RUNTIME_DIR="${T}/runtime-dir"
mkdir "${XDG_RUNTIME_DIR}" || die
chmod 0700 "${XDG_RUNTIME_DIR}" || die
distutils-r1_python_prepare_all
}
python_configure_all() {
append-flags -fno-strict-aliasing
append-cppflags -DNDEBUG # or get old trying to do triangulation
}
python_configure() {
mkdir -p "${BUILD_DIR}" || die
# create setup.cfg (see setup.cfg.template for any changes).
# common switches.
cat > "${BUILD_DIR}"/setup.cfg <<- EOF
[directories]
basedirlist = "${EPREFIX}/usr"
[provide_packages]
pytz = False
dateutil = False
[gui_support]
agg = True
$(use_setup cairo)
$(use_setup pyside)
$(use_setup qt4)
$(use_setup tk)
EOF
if use gtk3 && use cairo; then
echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
else
echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
fi
if $(python_is_python3); then
cat >> "${BUILD_DIR}"/setup.cfg <<- EOF
six = True
fltk = False
fltkagg = False
gtk = False
gtkagg = False
wx = False
wxagg = False
EOF
else
cat >> "${BUILD_DIR}"/setup.cfg <<-EOF
six = False
$(use_setup fltk)
$(use_setup gtk)
$(use_setup gtk3)
$(use_setup wxwidgets wx)
EOF
fi
}
wrap_setup() {
local MPLSETUPCFG=${BUILD_DIR}/setup.cfg
export MPLSETUPCFG
# Note: remove build... if switching to out-of-source build
"${@}" build --build-lib="${BUILD_DIR}"/build/lib
}
python_compile() {
wrap_setup distutils-r1_python_compile
}
python_compile_all() {
if use doc; then
cd doc || die
# necessary for in-source build
local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
VARTEXFONTS="${T}"/fonts \
"${PYTHON}" ./make.py --small html || die
fi
}
python_test() {
wrap_setup distutils_install_for_testing
cd "${TMPDIR}" || die
VIRTUALX_COMMAND="${PYTHON}"
virtualmake -c "import sys, matplotlib as m; sys.exit(0 if
m.test(verbosity=2) else 1)" || \
die "Tests fail with ${EPYTHON}"
}
python_install() {
wrap_setup distutils-r1_python_install
}
python_install_all() {
use doc && local HTML_DOCS=( doc/build/html/. )
distutils-r1_python_install_all
if use examples; then
dodoc -r examples
docompress -x /usr/share/doc/${PF}/examples
fi
}
