From: Justin Lecher Date: Fri, 20 Mar 2015 12:57:11 +0000 (+0000) Subject: Drop old; add qt5 support, bug #530492; fix slot usages X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e55271caeffa9809b078ffd74e5c69321b7025b4;p=gentoo.git Drop old; add qt5 support, bug #530492; fix slot usages Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog index aec9ab09d7e1..02674eafcad0 100644 --- a/dev-python/matplotlib/ChangeLog +++ b/dev-python/matplotlib/ChangeLog @@ -1,6 +1,11 @@ # 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.186 2015/03/09 00:03:04 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.187 2015/03/20 12:57:09 jlec Exp $ + + 20 Mar 2015; Justin Lecher -matplotlib-1.1.1.ebuild, + -matplotlib-1.3.0-r1.ebuild, -matplotlib-1.4.0.ebuild, + matplotlib-1.4.2.ebuild, matplotlib-1.4.3.ebuild, matplotlib-9999.ebuild: + Drop old; add qt5 support, bug #530492; fix slot usages 09 Mar 2015; Pacho Ramos matplotlib-1.4.2.ebuild: x86 stable, bug 540290 diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest index 4131dd793466..551b40d25004 100644 --- a/dev-python/matplotlib/Manifest +++ b/dev-python/matplotlib/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX matplotlib-1.1.1-ft-refcount.patch 1849 SHA256 4368439bce9f956ffad3cf4551103e077e433761a2d20976d9d45c2b3a84838a SHA512 6e596e7c0d2d37b4d878d36c42f33272f22ba0c25e80b8038b08ec3793d15d3d2ff88c4777fd12d36fd277374d1a1fc78424f1e6c7ccabc29230e8205cdf4d06 WHIRLPOOL 435527651c7eb3e1cf1ae5d66d8e09783564e4a53bb6aa84f7c65467a04f615ea4285c428074b97c87455f09789ffe9937436c324231379e720ec28f9ce30306 AUX matplotlib-1.2.0-ft-refcount.patch 1474 SHA256 53ac19eb195afc55173aee7617ebf2b7ca44e93943ee3713e9e62a1d959828b1 SHA512 9195c3046c6d2673d748f1864bfcf3fb6851260cd94f05ebf5241089d4c3b17af6f0dfc52875aa914d51ef79512ba686cc040958e2b4d6892a6a11a19c35b162 WHIRLPOOL ec1303427385fc697edff451576a7d5261a39e8134807be1a8a257077296d5171adf870826e8a0c96313c014e7f698cbed8c21a67a887d4479e33402842e07ea @@ -7,23 +7,29 @@ AUX matplotlib-1.2.0-setup.patch 1283 SHA256 e078b2385dc0b882a7df1a13df070ad5ec7 AUX matplotlib-1.3.0-setup_without_X11.patch 1349 SHA256 8161427194cbb28840153b6ac14d33deda0c7ca6ca3603127068cdead2b730e4 SHA512 160e3ac18a6c6ddd150c88a9f23d3e976d1f501e110a8da2eeb1c8433e52223477aab7b61006c9c8c03096e3a3b163e0e2101461b1ee32e17af433967337ecde WHIRLPOOL 6e50b1f3d49e642840010b471369f5945cbe08c3082f2b01c83cee3b62eb407de6a29a5a588a7f9c17ea51ec165da9d0caf90fe32f7408983d086b67039220d1 AUX matplotlib-1.3.1-unbundle-agg.patch 976 SHA256 1c22a991be0d0cecf9e5a0c3ab74aeb8951844dc480635c9da814a8c6e5ee6da SHA512 2e5a9045b69fd7f84fe0540aae6bde26b34db4dae29b725dc811b054f16e671f64345d28473f83861b0cfc0b14d2dd833ef188b3ba44c955db46475668c96786 WHIRLPOOL 5a26d99451fbdb1218e12ec9d5ebe6bf23f43eb4acf4019af9fde4ecb3eb67127d446112868836cc4165d65a403cf825a630c822e1e6466516b6549849849642 AUX matplotlib-1.3.1-unbundle-pycxx.patch 734 SHA256 ab33e8ba4879cd11c3e41394ae53566b2496c695328d9f498dd629124127fabf SHA512 4accb71a4b608c31637de354c2f6331dd69e98c352db059d0f1d3c0ade90b6fe11cdd3bfe799eabf7c52fa26e1fb81499064b15c07c34751ee6059c110956576 WHIRLPOOL 7b8c8ba9f93f282664b716358e57f61e18a022a80cdeea86d86dc8a907f1354ad8ddf8c3463ed8cfea10d0b1e0aeeacd58681b079cf2a931c9d24dc5b9f01497 -DIST matplotlib-1.1.1.tar.gz 33704843 SHA256 63b275eb8d98903264557ffbd6ec0fee2c31b5badb3678fce1ac7044594620ab SHA512 838977c1f57f9cfd10a3cd8935a5640bca25135b2176cb83286f309d57690cca7d6ec78c552c04067b3ded10f0358b92bb2387c018ecdb38ac30f661c4a67588 WHIRLPOOL d0fcc5a7f4d54c12a5b227b78b3977bb6822a61cf50f17d057458dab616ca293201d78e3ec5f1cb8722ee8a262ae2a252cb967a6bf24f7803841fb24831c4a96 -DIST matplotlib-1.3.0.tar.gz 42098180 SHA256 3e37044911245d7d881ddab0152cfec463c597b9a207c7f87021b8f40e1cbd98 SHA512 990e3a155ca7a9d329c41a43b44a9625f717205e81157c668a8f3f2ad5459ed3fed8c9bd85e7f81c509e0628d2192a262d4aa30c8bfc348bb67ed60a0362505a WHIRLPOOL f144b12ec8c0900ae20d39e0b01376ba52886dd7ded2d0b36a16ff0d59c0f9af946c95e3bb3fec7e4a589326ec6986afee70ff0905739e1912469122f45029a6 -DIST matplotlib-1.4.0.tar.gz 51153512 SHA256 6d670d0e7a0967ff92c8f8127440b7c533b22bc484b0b6b4d24548ab0d6a3da3 SHA512 41d4bc5a201cd28554fda321fe3ba8e70acf9d3d538ff3ea47795c2a48d88256fcdd0b43ada65220ef1c82b8c2d44953fe4f6f5c6a486380b9fe12b783cfbdf4 WHIRLPOOL e8b74e9be0c1a02439d7c1328c8316b4770ef5e35aa93974ff1c0146554a8da9978a60731947a810c33fe96490dd86ad5d95e9efe921eba926648d7cfba7af32 DIST matplotlib-1.4.2.tar.gz 50139344 SHA256 17a3c7154f152d8dfed1f37517c0a8c5db6ade4f6334f684989c36dab84ddb54 SHA512 3525f4e6414042fabf8d18ce9041d61197465dc07c766730c187a512277907ba33f56d49d5a468d82f65bce57217e8eb48ecfa143e55152a15607b79a7b25adc WHIRLPOOL ce6e5a15676b939bda7ad1be0f27766314f60ed44ebfba1e73d2c3d00a31d5492722cde73f943de72da038772519068602e60c830af9ffdf52710a24ce98fe7a DIST matplotlib-1.4.3.tar.gz 49933525 SHA256 5b9544472d9d6ab3d47423bdb5a0e64fdf913e505c1c083f25283dd0362bc0b6 SHA512 51b0f58b2618b47b653e17e4f6b6a1215d3a3b0f1331ce3555cc7435e365d9c75693f289ce12fe3bf8f69fd57b663e545f0f1c2c94e81eaa661cac0689e125f5 WHIRLPOOL 160ca48ecb44db58f1c56bd6e89592c5d1badd8e434fc25d32aa6d4d7a346ae7c7444d1c8e0c2ca2bf5c3246fd56cd93856ec7b1e3e51f5e471b9b55a0f2c1ad -EBUILD matplotlib-1.1.1.ebuild 4202 SHA256 571c120562f5dc8c0cf6a912b94ece8ad7f248a702263fb4c6d5fd22ba100690 SHA512 a29c07693d3302e4698dea93e3f4542dbfd6e55c52621edd6b9141b01a877c46b36a93d0a7874e1c7980a207ec5e6d2b0ac504d27c86b028ede554105e0fcbc0 WHIRLPOOL 91cf73fa5083d0169c7aaf3ccac0b6f9df3cc1241d4d722a3b30fb65cc89cf795e3cfa9f9a91f1aead56ad65fd93c149b7e884fc14d3c831b54a058657fc1f39 -EBUILD matplotlib-1.3.0-r1.ebuild 4947 SHA256 259cd36fef4a7db848637d7a13f2f8fe778320c0fcf3bd9cdd34a25a928fded2 SHA512 cf43b79ec48396dadc0b18fc59ed8f491b7917be6c1b35ce864ae43f3d264975cc7939743bef5f73103180b3c9d6c76df4ad63895b0d914eb302778570619bed WHIRLPOOL b0726771a23426050e4e59b65945383972be81b4d01f009c28c64b46b80469d39cab3e6944afb183212e12e4ba438966ac7935cf79f8111fb6454af7d788c438 -EBUILD matplotlib-1.4.0.ebuild 5862 SHA256 091a7df947bf8b2f247fae42b696b11201f116d9c5aca15a34c7b1cfdaa2a589 SHA512 e8ccb015a0ae78871feff016a8b7dbd4ad0fce2533cf3b74094c6a3e83d2b84905fa574f996375022e7595242b61a90fe128305d011f1cad29e33ace10490852 WHIRLPOOL 9182c44ac047bf967f2bfaeed2af9aadfa146c764c2e97776ca726e3fe6048e0188f4018989d68a25e14aefeed0f0a5a5080bbdc8a8f902571998d150d82d975 -EBUILD matplotlib-1.4.2.ebuild 5928 SHA256 2f4b18b5609451b4a4c1d662c258b1594c975eee9568c536180b41edb61a466a SHA512 58bde3dc393ee05a0696429dda0589e7589ac177d305cd11b7f01b67be0938fa802d7b8361df69b3361f0cb1136df6f9814fe76eabfa8907aa77891fd4fe9fc9 WHIRLPOOL 5e0c09039ab01126c9dec552ffa70991184fae0f986275a1782210a80f0f7eaa04168950a62bd553efb27b1fbd0aff5bb6224fc5e415e37603d740dbf8fb0816 -EBUILD matplotlib-1.4.3.ebuild 5936 SHA256 5bddc85066a9d9c85df1464b0eef07c76fa4da77e082a8124f12ebbf7907c087 SHA512 221835d130198030ecd0e18561dd8d6aefb305f1ad291b0a369c1695ac24021fe7791111d0867a3a891f7b58eca5f6c2f5cfbb12fa58b72b06ea8346952a7d19 WHIRLPOOL 937e56da2cc7ea2808113c13f274060339fb8aa6711031baf9bde71e24d430167bbcf0e8a3cf25e85a74f985c109166b90e4a0eb009e75f6965153e2d4199c6e -EBUILD matplotlib-9999.ebuild 5731 SHA256 0d25b6f6e61ecf00c610ee005890ea12f2f06bf40a014034683cabf2fa281524 SHA512 03e87d89f1802f591e45777dc46cb5bc5ea56dbb8ea971fa58837e3e871391df7f6594ee19f3695b624e465649bc5a8e497f59d0c2f72d6a4ad90933081ba49e WHIRLPOOL 44430cb38e0e10395cf07642a20a768f38f6d669d4cd1297f4895181dd2c5dab952644ca34221bef3fcbb999d124ce7681f19ae08342e5b6b67029b2079c5de7 -MISC ChangeLog 33123 SHA256 e348a34afd3d97ebc501f3f2b0707cc6a3667c4ba163c63cbd51daaef991104e SHA512 837c8cdee6a13ef364b9910c94dd995d90dd34717a3099bd9fd9dc99cbcadc41a6405e7ee30e159db2e78be974e5c419d4b0e8fbd4053e133f456c3b53e94564 WHIRLPOOL 8df2c069d73e2d7627a99f72c74ef8e9fac204fa60cfb8f4ad23e8dc450030dfd735f3f6ae27658fc1fe8b5dbdd01ec29fa210201e69a8949ea02e744a17d89c +EBUILD matplotlib-1.4.2.ebuild 5933 SHA256 c1156d2f2dcdb9f73b9ceceabc0326d080d3f8be6dee19f15c3391f2dc52a0e9 SHA512 88482e5de389c122c690ddf9a0b3e122668d5268c97cad461de33bcdce7a2d3a268de800806b3602a15dbe42b1505b5df31469514328cb479155f4bdf64a8a90 WHIRLPOOL 487071898e047cead9da9f19c9957dd505d977d4b11fc52d817ecfec0017074c5f53e9a28a38e3af9e1d60b10f92e5cba656b53593b041533a8a1b64e63ac9f8 +EBUILD matplotlib-1.4.3.ebuild 6084 SHA256 9689d52cb8f6393214bace1284edfac1e23c41d6b28999875414f99410f18888 SHA512 ac13704b8aedd819fe1b7ce92ec096411cb66317ec95f435d762b9c4e647fda592445a6d61195a3f768762b282bba484741d637efce5a18476d417ff5f564697 WHIRLPOOL fec79cb66f30ba21f1033e0b54d5c8ab206212c65d147ee8de7296e536d3471fe4f6e85f3332ad13fd942c6f4264b52b87c3a4c475ec8f4b5089a27e982917a8 +EBUILD matplotlib-9999.ebuild 5934 SHA256 947ed829b65e33df8dea7be93ae5e134e6aa46718997f08538847fa520ed9c3e SHA512 87f4fd103e95d49bf61f9986d5dc4ef6b07bd349974d5355c89186153d465e88ee2023361ca7876dcdb8e5972feafdccbe49f7144dfb04557b7d8ba88ecf0595 WHIRLPOOL 2b365353ba897db882a777aed63d416b3da77d436264b7240d2940b2d853c4a3575717d0bbd6e6e6ab1a3b05388635a9c4c2bc2c56df8d4c7fcfa18a81d19b24 +MISC ChangeLog 33387 SHA256 8fc7554e43e40940cd879343547c799d7cf3cff8dc8fdcdecebd9c9181d2cf4c SHA512 0761ef1fdad371798d3ca8df251b75c23253e71d8da5992776c1b3cba51925c098ea11df9a7d2f81cd365028e044abb004d3ea204a4f6f4cb25d04c5720cf98d WHIRLPOOL 4fbb595a9f1fe7e3df312709d3f7e4c46c22e51f640facaf272c8fe5c57210bba81d170d9b95b436f49a0f3020c5d71eaba35972cb288a9ff514fc47841ebeac MISC metadata.xml 789 SHA256 12569e0385ec9776d695440fced8b0a13ab2b9fed065e764797dd8b6a48c6740 SHA512 aa78de21b25acdcb7fffdabca04dbd3ea4e1f34d85a1da7e78c877c5dd73d116f02687c756a2591dcd969220b398c01580b226978a46640b0e8862415c80fb4c WHIRLPOOL 310bfcb051f4cb9de04eef34754efe3fdf5777f3dec7d233833eaf31c882a4ae0f0bd850a3c0716ab37ac43f3960a95e769b355c739d9feb014ba933816c8e0d -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iEYEAREIAAYFAlT84zUACgkQCaWpQKGI+9T8owCePXtRlhWvBfiu4mHvwtII15HT -pgAAn1s4CUmEMUlODqrNDmWNw8g2ZIrB -=RdXs +iQJ8BAEBCgBmBQJVDBknXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirYbgP/238vi5SKVbHOBH+KcmXZ79k +/mdaoVFE/bg/bg4yUhGngCFR5gqueyA8KuKNnTBkDGyryOgOUECF6plfTuGCBB9P +GGvbdR592ptf5MgW0Bcd6e8A/fuf9rdRYcszHaf1PpgzZk4CnpNpw0yXhsRKC7oq +3KFnkchtoGcNqlAX04PAwj/H1De8c8W/m31PvzfUpkOB/xXCWDFXdi7egjomlAdj +9CxcmpMhR9+Vmu3rq4cUbA5NAWbvWG9EyFs7FAVHXk+fuqw+whW/ygwNgQe8Ncvf +FfF37bZleSba8nEIwxpqZmWkkYjQDLpQwNrFZ9qmV4s9dTkf4FbX4LIXQLTMBjet +w8nrnIqXP0hlh/nFAE2Bd/gHt3PhS+Vdlaprwa2HhF7K0UwcNv87GgOFu2+sFJn5 +AmLrMK8S83GjLxcPAjsmwNauDFlXRAG6uD/e40TccqGIEWLw9T8Rk6ZVJF4wC+5F +yJWmF3asjDeXWC0eyOLmV3oONsGc3Y0V4Fct88e9ZPGEa9S+fT2cwnVGwQ5Zw/Me +RtPIKRIPfvBC6K8dmf0APik09fBhxtR827IcOGdUE8ehfE3x87F5UMOMHJsrZGX2 +wt+G94k5kw/mpQP78DQ2V7U7RqAoixuI2ir2Ltxwq2T8LtBUM00A6XvjpDdbPMKT +QzTIUX5uSa7sAegHhIxE +=xvGh -----END PGP SIGNATURE----- diff --git a/dev-python/matplotlib/matplotlib-1.1.1.ebuild b/dev-python/matplotlib/matplotlib-1.1.1.ebuild deleted file mode 100644 index e870facedf6d..000000000000 --- a/dev-python/matplotlib/matplotlib-1.1.1.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.1.1.ebuild,v 1.10 2013/09/12 22:29:33 mgorny Exp $ - -EAPI="3" - -PYTHON_DEPEND="2" -PYTHON_USE_WITH="tk" -PYTHON_USE_WITH_OPT="tk" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3* *-jython 2.7-pypy-*" -PYTHON_CFLAGS=("2.* + -fno-strict-aliasing") -PYTHON_CXXFLAGS=("2.* + -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.sourceforge.net/ http://pypi.python.org/pypi/matplotlib" -SRC_URI="mirror://sourceforge/${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 ) - wxwidgets? ( dev-python/wxpython:2.8 )" - -# internal copy of pycxx highly patched -# dev-python/pycxx - -DEPEND="${CDEPEND} - virtual/pkgconfig - doc? ( - app-text/dvipng - virtual/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] ) )" - -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() { - # from upstream commit ca678a49f37411b1b0e72d7d0dfa88c124b0e34b - epatch "${FILESDIR}"/${P}-ft-refcount.patch - - # create setup.cfg (see setup.cfg.template for any changes) - cat > setup.cfg <<-EOF - [provide_packages] - pytz = False - dateutil = 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 - sed -i \ - -e "s/check_for_gtk()/$(use gtk && echo True || echo False)/" \ - -e "s/check_for_tk()/$(use tk && echo True || echo False)/" \ - setup.py || die "sed setup.py failed" - - # remove internal copies of pyparsing - rm lib/matplotlib/pyparsing.py || die - sed -i \ - -e 's/matplotlib.pyparsing/pyparsing/g' \ - lib/matplotlib/{mathtext,fontconfig_pattern}.py \ - || die "sed pyparsing failed" - distutils_src_prepare -} - -src_compile() { - unset DISPLAY # bug #278524 - distutils_src_compile - makedocs() { - if use doc; then - cd "${S}/doc" - 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" - fi - } - python_execute_function -f makedocs -} - -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 -} diff --git a/dev-python/matplotlib/matplotlib-1.3.0-r1.ebuild b/dev-python/matplotlib/matplotlib-1.3.0-r1.ebuild deleted file mode 100644 index fdf5f44d9f18..000000000000 --- a/dev-python/matplotlib/matplotlib-1.3.0-r1.ebuild +++ /dev/null @@ -1,204 +0,0 @@ -# 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.3.0-r1.ebuild,v 1.1 2015/01/05 14:40:19 hasufell Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_2,3_3} ) -PYTHON_REQ_USE='tk?' - -inherit distutils-r1 eutils flag-o-matic - -DESCRIPTION="Pure python plotting library with matlab like syntax" -HOMEPAGE="http://matplotlib.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -IUSE="cairo doc excel examples fltk gtk gtk3 latex qt4 test tk wxwidgets" -SLOT="0" -KEYWORDS="amd64 arm ~mips ~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" - -# #456704 -- a lot of py2-only deps -PY2_USEDEP=$(python_gen_usedep 'python2*') -COMMON_DEPEND=" - "${BUILD_DIR}"/setup.cfg <<-EOF - [directories] - basedirlist = ${EPREFIX}/usr - [provide_packages] - pytz = False - dateutil = False - [gui_support] - $(use_setup cairo) - $(use_setup qt4) - $(use_setup tk) - EOF - - if [[ ${EPYTHON} == 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 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} - - unset DISPLAY # bug #278524 - VARTEXFONTS="${T}"/fonts \ - "${PYTHON}" ./make.py --small html || die - fi -} - -python_test() { - wrap_setup distutils_install_for_testing - - cd "${TMPDIR}" || die - "${PYTHON}" -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 -} diff --git a/dev-python/matplotlib/matplotlib-1.4.0.ebuild b/dev-python/matplotlib/matplotlib-1.4.0.ebuild deleted file mode 100644 index 7533f83eeb27..000000000000 --- a/dev-python/matplotlib/matplotlib-1.4.0.ebuild +++ /dev/null @@ -1,247 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.4.0.ebuild,v 1.3 2014/11/23 16:36:23 floppym 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.3[${PYTHON_USEDEP}] - media-fonts/stix-fonts - media-libs/freetype:2 - 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 -} - -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 -} diff --git a/dev-python/matplotlib/matplotlib-1.4.2.ebuild b/dev-python/matplotlib/matplotlib-1.4.2.ebuild index f64a1eb29ee0..07f5b4a269e8 100644 --- a/dev-python/matplotlib/matplotlib-1.4.2.ebuild +++ b/dev-python/matplotlib/matplotlib-1.4.2.ebuild @@ -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.11 2015/03/09 00:03:04 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.4.2.ebuild,v 1.12 2015/03/20 12:57:09 jlec Exp $ EAPI=5 @@ -35,11 +35,11 @@ COMMON_DEPEND=" media-libs/libpng:0 media-libs/qhull gtk? ( - dev-libs/glib + dev-libs/glib:2= x11-libs/gdk-pixbuf - x11-libs/gtk+:2 + x11-libs/gtk+:2= dev-python/pygtk[${PY2_USEDEP}] ) - wxwidgets? ( >=dev-python/wxpython-2.8[${PY2_USEDEP}] )" + wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )" # internal copy of pycxx highly patched # dev-python/pycxx diff --git a/dev-python/matplotlib/matplotlib-1.4.3.ebuild b/dev-python/matplotlib/matplotlib-1.4.3.ebuild index a81f3a372d60..52f388f05ce3 100644 --- a/dev-python/matplotlib/matplotlib-1.4.3.ebuild +++ b/dev-python/matplotlib/matplotlib-1.4.3.ebuild @@ -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.3.ebuild,v 1.1 2015/02/24 16:19:16 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.4.3.ebuild,v 1.2 2015/03/20 12:57:09 jlec Exp $ EAPI=5 @@ -21,7 +21,7 @@ SLOT="0" # 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" +IUSE="cairo doc excel examples fltk gtk gtk3 latex pyside qt4 qt5 test tk wxwidgets" # #456704 -- a lot of py2-only deps PY2_USEDEP=$(python_gen_usedep python2_7) @@ -31,15 +31,15 @@ COMMON_DEPEND=" dev-python/pytz[${PYTHON_USEDEP}] >=dev-python/six-1.4[${PYTHON_USEDEP}] media-fonts/stix-fonts - >=media-libs/freetype-2.3 + media-libs/freetype:2 media-libs/libpng:0 media-libs/qhull gtk? ( - dev-libs/glib + 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}] )" + wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )" # internal copy of pycxx highly patched # dev-python/pycxx @@ -86,7 +86,9 @@ RDEPEND="${COMMON_DEPEND} dev-texlive/texlive-xetex ) pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] ) - qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )" + qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] ) + qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] ) + " PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )" REQUIRED_USE=" @@ -96,7 +98,7 @@ REQUIRED_USE=" gtk? ( ${PY2_FLAGS} ) wxwidgets? ( ${PY2_FLAGS} ) test? ( - cairo fltk latex pyside qt4 tk wxwidgets + cairo fltk latex pyside qt5 qt4 tk wxwidgets || ( gtk gtk3 ) )" @@ -140,6 +142,10 @@ python_prepare_all() { -e '/tol/s:32:35:g' \ -i lib/matplotlib/tests/test_mathtext.py || die + sed \ + -e "s:/usr/:${EPREFIX}/usr/:g" \ + -i setupext.py || die + export XDG_RUNTIME_DIR="${T}/runtime-dir" mkdir "${XDG_RUNTIME_DIR}" || die chmod 0700 "${XDG_RUNTIME_DIR}" || die @@ -169,6 +175,7 @@ python_configure() { $(use_setup cairo) $(use_setup pyside) $(use_setup qt4) + $(use_setup qt5) $(use_setup tk) EOF diff --git a/dev-python/matplotlib/matplotlib-9999.ebuild b/dev-python/matplotlib/matplotlib-9999.ebuild index c5de0b3066d6..a6be5622cbbf 100644 --- a/dev-python/matplotlib/matplotlib-9999.ebuild +++ b/dev-python/matplotlib/matplotlib-9999.ebuild @@ -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-9999.ebuild,v 1.7 2015/02/24 16:19:16 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-9999.ebuild,v 1.8 2015/03/20 12:57:09 jlec Exp $ EAPI=5 @@ -8,8 +8,6 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} ) PYTHON_REQ_USE='tk?' -VIRTUALX_REQUIRED="always" - inherit distutils-r1 eutils flag-o-matic git-r3 virtualx DESCRIPTION="Pure python plotting library with matlab like syntax" @@ -24,20 +22,25 @@ SLOT="0" # Fonts: BitstreamVera, OFL-1.1 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" KEYWORDS="" -IUSE="cairo doc excel examples fltk gtk gtk3 latex pyside qt4 test tk wxwidgets" +IUSE="cairo doc excel examples fltk gtk gtk3 latex pyside qt4 qt5 test tk wxwidgets" # #456704 -- a lot of py2-only deps -PY2_USEDEP=$(python_gen_usedep 'python2*') +PY2_USEDEP=$(python_gen_usedep python2_7) COMMON_DEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] + >=dev-python/numpy-1.6[${PYTHON_USEDEP}] dev-python/python-dateutil:0[${PYTHON_USEDEP}] dev-python/pytz[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] + >=dev-python/six-1.4[${PYTHON_USEDEP}] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 - gtk? ( dev-python/pygtk[${PY2_USEDEP}] ) - wxwidgets? ( >=dev-python/wxpython-2.8[${PY2_USEDEP}] )" + media-libs/qhull + gtk? ( + 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 @@ -48,7 +51,7 @@ DEPEND="${COMMON_DEPEND} app-text/dvipng virtual/python-imaging[${PYTHON_USEDEP}] dev-python/ipython[${PYTHON_USEDEP}] - dev-python/numpydoc[${PY2_USEDEP}] + dev-python/numpydoc[${PYTHON_USEDEP}] dev-python/xlwt[${PY2_USEDEP}] dev-python/sphinx[${PYTHON_USEDEP}] dev-texlive/texlive-latexextra @@ -56,7 +59,10 @@ DEPEND="${COMMON_DEPEND} dev-texlive/texlive-latexrecommended media-gfx/graphviz[cairo] ) - test? ( dev-python/nose[${PYTHON_USEDEP}] )" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + >=dev-python/nose-0.11.1[${PYTHON_USEDEP}] + )" RDEPEND="${COMMON_DEPEND} dev-python/pyparsing[${PYTHON_USEDEP}] @@ -76,9 +82,11 @@ RDEPEND="${COMMON_DEPEND} dev-texlive/texlive-xetex ) pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] ) - qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )" + qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] ) + qt5? ( dev-python/PyQt5[X,${PYTHON_USEDEP}] ) + " -PY2_FLAGS="|| ( $(python_gen_useflags python2*) )" +PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )" REQUIRED_USE=" doc? ( ${PY2_FLAGS} ) excel? ( ${PY2_FLAGS} ) @@ -96,6 +104,10 @@ RESTRICT="mirror" # 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 @@ -115,6 +127,7 @@ python_prepare_all() { # ) # 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 \ @@ -125,11 +138,14 @@ python_prepare_all() { -e '/tol/s:32:35:g' \ -i lib/matplotlib/tests/test_mathtext.py || die - if use gtk || use gtk3; then - export XDG_RUNTIME_DIR="${T}/runtime-dir" - mkdir "${XDG_RUNTIME_DIR}" || die - chmod 0700 "${XDG_RUNTIME_DIR}" || die - fi + sed \ + -e "s:/usr/:${EPREFIX}/usr/:g" \ + -i setupext.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 } @@ -144,9 +160,9 @@ python_configure() { # create setup.cfg (see setup.cfg.template for any changes). # common switches. - cat > "${BUILD_DIR}"/setup.cfg <<-EOF + cat > "${BUILD_DIR}"/setup.cfg <<- EOF [directories] - basedirlist = ${EPREFIX}/usr + basedirlist = "${EPREFIX}/usr" [provide_packages] pytz = False dateutil = False @@ -155,6 +171,7 @@ python_configure() { $(use_setup cairo) $(use_setup pyside) $(use_setup qt4) + $(use_setup qt5) $(use_setup tk) EOF @@ -165,7 +182,7 @@ python_configure() { fi if $(python_is_python3); then - cat >> "${BUILD_DIR}"/setup.cfg <<-EOF + cat >> "${BUILD_DIR}"/setup.cfg <<- EOF six = True fltk = False fltkagg = False @@ -194,8 +211,7 @@ wrap_setup() { } python_compile() { - VIRTUALX_COMMAND="wrap_setup distutils-r1_python_compile" - virtualmake + wrap_setup distutils-r1_python_compile } python_compile_all() { @@ -205,7 +221,6 @@ python_compile_all() { # necessary for in-source build local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH} - unset DISPLAY # bug #278524 VARTEXFONTS="${T}"/fonts \ "${PYTHON}" ./make.py --small html || die fi