unfork matplotlib and scipy, fixed properly in gentoo

This commit is contained in:
Rick Farina (Zero_Chaos) 2020-01-27 13:24:09 -05:00
parent 6ea283c439
commit 7b4a6e5a97
No known key found for this signature in database
GPG key ID: A29433C0AA431DDC
9 changed files with 0 additions and 508 deletions

View file

@ -1 +0,0 @@
DIST matplotlib-2.2.4.tar.gz 36974286 BLAKE2B 9c4c69163a23ff02107ee155f72e142dcf31ba965f6a20f468b96f3f4b70b95ff6caade6b14bcbacd5b231848d2000ce6af9f113feefb41d6e186725349490d3 SHA512 968f5731b8a9a2c5575403c60d5b0a98a452b33094e520be44f4d901f892d082babc8fc1d73c519e1ff2baf756f3cb7652f4b796e166d66dfda31f7e50c58139

View file

@ -1,10 +0,0 @@
diff -r -U2 matplotlib-2.1.2.orig/doc/conf.py matplotlib-2.1.2/doc/conf.py
--- matplotlib-2.1.2.orig/doc/conf.py 2018-01-19 11:07:49.000000000 +0700
+++ matplotlib-2.1.2/doc/conf.py 2018-01-21 20:06:44.120901546 +0700
@@ -136,5 +136,5 @@
}
-plot_gallery = 'True'
+plot_gallery = True
# Add any paths that contain templates here, relative to this directory.

View file

@ -1,18 +0,0 @@
diff --git a/doc/conf.py b/doc/conf.py
index 017ce210e..5a397082b 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -170,10 +170,10 @@ source_encoding = "utf-8"
master_doc = 'contents'
# General substitutions.
-from matplotlib.compat.subprocess import check_output
-SHA = check_output(['git', 'describe', '--dirty']).decode('utf-8').strip()
+#from matplotlib.compat.subprocess import check_output
+#SHA = check_output(['git', 'describe', '--dirty']).decode('utf-8').strip()
-html_context = {'sha': SHA}
+#html_context = {'sha': SHA}
project = 'Matplotlib'
copyright = ('2002 - 2012 John Hunter, Darren Dale, Eric Firing, '

View file

@ -1,18 +0,0 @@
diff --git a/setup.py b/setup.py
index 41037e95d..6a438fa99 100644
--- a/setup.py
+++ b/setup.py
@@ -178,9 +178,10 @@ class sdist_with_jquery(_orgin_sdist):
class install_lib_with_jquery(InstallLibCommand):
def run(self):
InstallLibCommand.run(self)
- _download_jquery_to(
- os.path.join(self.install_dir, "matplotlib/backends/web_backend/"))
-
+ # Avoid downloading jquery ui during emerge: we already have it in
+ # pypi's tarball. use this!
+ name = "matplotlib/backends/web_backend/jquery-ui-1.12.1"
+ os.rename(os.path.join('lib', name), os.path.join(self.install_dir, name))
class develop_with_jquery(DevelopCommand):
def run(self):

View file

@ -1,263 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 python3_{6,7} )
PYTHON_REQ_USE='tk?,threads(+)'
inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
DESCRIPTION="Pure python plotting library with matlab like syntax"
HOMEPAGE="https://matplotlib.org/"
SRC_URI="mirror://pypi/${PN:0:1}/${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 ~arm64 ~ppc ~ppc64 ~x86"
IUSE="cairo doc excel examples gtk2 gtk3 latex qt5 test tk wxwidgets"
RESTRICT="!test? ( test )"
PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
REQUIRED_USE="
gtk2? ( ${PY2_FLAGS} )
wxwidgets? ( ${PY2_FLAGS} )
test? (
cairo latex qt5 tk wxwidgets
|| ( gtk2 gtk3 )
)"
# #456704 -- a lot of py2-only deps
PY2_USEDEP=$(python_gen_usedep python2_7)
PY2_DEPEND="
$(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' python2_7)
$(python_gen_cond_dep 'dev-python/subprocess32[${PYTHON_USEDEP}]' python2_7)
$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)"
COMMON_DEPEND="
dev-python/cycler[${PYTHON_USEDEP}]
$(python_gen_cond_dep 'dev-python/numpy-python2[${PYTHON_USEDEP}]' 'python2*')
$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' 'python3*')
dev-python/python-dateutil:0[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
>=dev-python/six-1.10[${PYTHON_USEDEP}]
media-fonts/stix-fonts
media-libs/freetype:2
media-libs/libpng:0
>=media-libs/qhull-2013
>=dev-python/kiwisolver-1.0.0[${PYTHON_USEDEP}]
cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
gtk2? (
dev-libs/glib:2=
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}
${PY2_DEPEND}
dev-python/versioneer[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
virtual/pkgconfig
doc? (
app-text/dvipng
dev-python/colorspacious[${PYTHON_USEDEP}]
dev-python/pillow[${PYTHON_USEDEP}]
dev-python/ipython[${PYTHON_USEDEP}]
dev-python/mock[${PY2_USEDEP}]
>=dev-python/numpydoc-0.8[${PYTHON_USEDEP}]
<dev-python/numpydoc-0.9
sci-libs/scipy[${PYTHON_USEDEP}]
>=dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
>=dev-python/sphinx-gallery-0.3.1[${PYTHON_USEDEP}]
dev-python/xlwt[${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}
${PY2_DEPEND}
>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
excel? ( dev-python/xlwt[${PYTHON_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
)
qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )"
# 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
# cat > lib/${PN}/externals/six.py <<-EOF
# from __future__ import absolute_import
# from six import *
# EOF
local PATCHES=(
"${FILESDIR}"/${PN}-2.2.4-doc-fix.patch
"${FILESDIR}"/${PN}-2.2.4-no-jqueryui-download.patch
)
sed \
-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
|| die "sed pyparsing failed"
hprefixify setupext.py
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
tc-export PKG_CONFIG
}
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 || die
[directories]
basedirlist = ${EPREFIX}/usr
[provide_packages]
pytz = False
dateutil = False
[packages]
tests = $(usex test True False)
[gui_support]
agg = True
pyside = False
pysideagg = False
qt4 = False
qt4agg = False
$(use_setup cairo)
$(use_setup gtk3)
$(use_setup qt5)
$(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 || die
gtk = False
gtkagg = False
wx = False
wxagg = False
EOF
else
cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
$(use_setup gtk2 gtk)
$(use_setup wxwidgets wx)
EOF
fi
}
wrap_setup() {
local MAKEOPTS=-j1
local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
unset DISPLAY
"$@"
}
python_compile() {
wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
}
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 \
emake SPHINXOPTS= O=-Dplot_formats=png:100 html
fi
}
python_test() {
wrap_setup distutils_install_for_testing
virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
}
python_install() {
wrap_setup distutils-r1_python_install
# mpl_toolkits namespace
python_moduleinto mpl_toolkits
python_domodule lib/mpl_toolkits/__init__.py
}
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
find "${D}" -name '*.pth' -delete || die
}

View file

@ -1,27 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
<name>Gentoo Science Project</name>
</maintainer>
<maintainer type="project">
<email>python@gentoo.org</email>
<name>Python</name>
</maintainer>
<longdescription lang="en">
matplotlib is an interactive library for plotting and doing basic
data analysis in python with a syntax similar to matlab. It provides a
variety of backends and hard copy formats for almost ready
publication plots.
</longdescription>
<use>
<flag name="excel">Pull <pkg>dev-python/xlwt</pkg> for the exceltools toolkit</flag>
<flag name="gtk2">Enable <pkg>x11-libs/gtk+</pkg>:2 support</flag>
<flag name="gtk3">Enable <pkg>x11-libs/gtk+</pkg>:3 support</flag>
</use>
<upstream>
<remote-id type="pypi">matplotlib</remote-id>
<remote-id type="sourceforge">matplotlib</remote-id>
</upstream>
</pkgmetadata>

View file

@ -1,3 +0,0 @@
DIST scipy-1.1.0-html.zip 49851258 BLAKE2B 528df7ed8aa8e56662f436f31ee9e1d6d72d6fe962f9f0f6f84b7a2704b53009ce333b2102ec73bb7795110f8a61b18246aab95b1e21055f2b68c0ff2225b7bb SHA512 a03894a22a67c1359ee6206e9e1c9de1f926a7f829f5039f161e78df735708da09b0e51cdad3bf36bfede701d0bc5dc44f8cc0f249b6bfb80c9d8c9fe23aed46
DIST scipy-1.1.0-ref.pdf 34360806 BLAKE2B f82807879d5d36d91d74e8983a0f4104bcb4b69cb7787fe5190f73fbbfcb8635a9399686b3c75736d3b0b5dd877b5280ff6fba728520e3b47c13ffc7835f8cd6 SHA512 c792064c986dffafa3c5d0741f30715028e655761d099f0fdd472270cf34642b367dfa2178ddceba13043a471e3aeb1db20d65308dbb40c704dab576aaadeb3e
DIST scipy-1.1.0.tar.gz 15583560 BLAKE2B 477753e622ee26a3bc8c2cb6829410152df84b29ce17a6d53a66348f5536f7993fedf5d32b782405b54b3af3feabf9bc91c381ed39546076849c2fdb71039404 SHA512 72fe32c6c009613cb78202598e5db14f8e630b3218839cfe18d43d40550d94cc5aa100c6f5d41f40e86ae148e9b6a13431bb91b0f9be44b0569ccd7b725fe973

View file

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
<name>Gentoo Science Project</name>
</maintainer>
<longdescription lang="en">
SciPy is an open source library of scientific tools for Python. SciPy
supplements the popular numpy module, gathering a variety of high level
science and engineering modules together as a single package.
SciPy includes modules for graphics and plotting, optimization,
integration, special functions, signal and image processing, genetic
algorithms, ODE solvers, and others.
</longdescription>
<use>
<flag name="sparse">Adds support for sparse solving with <pkg>sci-libs/umfpack</pkg></flag>
</use>
<upstream>
<remote-id type="pypi">scipy</remote-id>
<remote-id type="sourceforge">scipy</remote-id>
</upstream>
</pkgmetadata>

View file

@ -1,145 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 python3_{6,7} )
PYTHON_REQ_USE="threads(+)"
DOC_PV=${PV}
inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
DESCRIPTION="Scientific algorithms library for Python"
HOMEPAGE="https://www.scipy.org/"
SRC_URI="
mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
doc? (
https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip -> ${PN}-${DOC_PV}-html.zip
https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf -> ${PN}-${DOC_PV}-ref.pdf
)"
LICENSE="BSD LGPL-2"
SLOT="0"
IUSE="doc sparse test"
RESTRICT="!test? ( test )"
KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
CDEPEND="
$(python_gen_cond_dep 'dev-python/numpy-python2[${PYTHON_USEDEP}]' python2_7)
$(python_gen_cond_dep 'dev-python/numpy[lapack,${PYTHON_USEDEP}]' 'python3*')
sci-libs/arpack:0=
virtual/cblas
virtual/lapack
sparse? ( sci-libs/umfpack:0= )"
DEPEND="${CDEPEND}
dev-lang/swig
>=dev-python/cython-0.22[${PYTHON_USEDEP}]
>=dev-python/setuptools-36[${PYTHON_USEDEP}]
virtual/pkgconfig
doc? ( app-arch/unzip )
test? (
dev-python/nose[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
)"
RDEPEND="${CDEPEND}
dev-python/pillow[${PYTHON_USEDEP}]"
DOCS=( HACKING.rst.txt THANKS.txt )
DISTUTILS_IN_SOURCE_BUILD=1
src_unpack() {
default
if use doc; then
unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
fi
}
pc_incdir() {
$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
}
pc_libdir() {
$(tc-getPKG_CONFIG) --libs-only-L $@ | \
sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
}
pc_libs() {
$(tc-getPKG_CONFIG) --libs-only-l $@ | \
sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
}
python_prepare_all() {
# scipy automatically detects libraries by default
export {FFTW,FFTW3,UMFPACK}=None
use sparse && unset UMFPACK
# the missing symbols are in -lpythonX.Y, but since the version can
# differ, we just introduce the same scaryness as on Linux/ELF
[[ ${CHOST} == *-darwin* ]] \
&& append-ldflags -bundle "-undefined dynamic_lookup" \
|| append-ldflags -shared
[[ -z ${FC} ]] && export FC="$(tc-getFC)"
# hack to force F77 to be FC until bug #278772 is fixed
[[ -z ${F77} ]] && export F77="$(tc-getFC)"
export F90="${FC}"
export SCIPY_FCONFIG="config_fc --noopt --noarch"
append-fflags -fPIC
local libdir="${EPREFIX}"/usr/$(get_libdir)
cat >> site.cfg <<-EOF || die
[blas]
include_dirs = $(pc_incdir cblas)
library_dirs = $(pc_libdir cblas blas):${libdir}
blas_libs = $(pc_libs cblas blas)
[lapack]
library_dirs = $(pc_libdir lapack):${libdir}
lapack_libs = $(pc_libs lapack)
EOF
# Drop hashes to force rebuild of cython based .c code
rm cythonize.dat || die
distutils-r1_python_prepare_all
}
python_compile() {
# FIXME: parallel python building fails, bug #614464
${EPYTHON} tools/cythonize.py || die
distutils-r1_python_compile \
${SCIPY_FCONFIG}
}
python_test() {
# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
distutils_install_for_testing ${SCIPY_FCONFIG}
cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
"${PYTHON}" -c \
'import numpy as np; print("relaxed strides checking:", np.ones((10,1),order="C").flags.f_contiguous)' \
|| die
"${EPYTHON}" -c \
"import scipy, sys; r = scipy.test('fast', verbose=2); sys.exit(r)" \
|| die "Tests fail with ${EPYTHON}"
}
python_install_all() {
use doc && \
local DOCS=( "${DISTDIR}"/${PN}-${DOC_PV}-ref.pdf ) \
local HTML_DOCS=( "${WORKDIR}"/html/. )
distutils-r1_python_install_all
}
python_install() {
distutils-r1_python_install ${SCIPY_FCONFIG}
}
pkg_postinst() {
elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
elog "to your prefered image viewer. Example:"
elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
}