diff options
Diffstat (limited to 'sci-visualization')
23 files changed, 213 insertions, 286 deletions
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz Binary files differindex e6f2c1c00052..2b3d269da375 100644 --- a/sci-visualization/Manifest.gz +++ b/sci-visualization/Manifest.gz diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest index 4fc6629d49ca..1b336f473c37 100644 --- a/sci-visualization/gnuplot/Manifest +++ b/sci-visualization/gnuplot/Manifest @@ -3,11 +3,11 @@ AUX gnuplot-5.0.6-no-picins.patch 956 BLAKE2B 41485f39f7640426624abcfa3f92317680 AUX gnuplot-5.2.2-regis.patch 1171 BLAKE2B 57d2faba0f01ca27de0ff39b9b9d01faeffcbedacd240c39aa7756fffa27aa2f6d28d3cf5d24f2b6a88399ada1538676f408851957e5df026411dffb32665689 SHA512 fe9154eb6687426542fd51b42b80378e1755007e81628be6bb318a8aaabd90dc7cadb85362162e7e323a0cf60b6bcd0509bb0318888c17bb5e4330f4c00f1f6b AUX gnuplot-5.2.6-caca.patch 385 BLAKE2B 33607e93cf59c6774892df7588c843c9c03b2ee561a6bf5d8e58e18ef62edd5b5b2eab77360a99e94640eda81963b38a683cf5598f02f72774da81d56317250c SHA512 913e9df29f8ad3f97abd06cb9ae5d259b423f05ac96855be658d2b000227e6a578e7fd9279377353e45c929020b3f2303e28549e2096866c5d250705a4d08a7d DIST gnuplot-5.0.7.tar.gz 5100186 BLAKE2B 97fcefa12148fc2b581113c5283eb09217e87858ae293931758d0bb595fd7aaca4671216956211a3d30492be35f91809a975c9c80c25861c477e9235a8b5b309 SHA512 5d7241dc1472f87af8632110a1e88f83b5ea3f41e1bc8c89a45dc4662a3071d91a25bf9ae5196a2b8bef09c8079c22f635bb947c02def3416d78880d61eea919 -DIST gnuplot-5.2.6.tar.gz 5321601 BLAKE2B 4281ba29926ee7fc046b48006fed6513dd3a9ee8bd3a6aa41c5782c5162bfc8af64ffdfec77d4996af6a634f5f3424404eab77c0efd91c65bd34412f5b8f17c7 SHA512 557c0d00c951055ca03ef0f2b262e96b8013da4fedeb64dc5325fabd94772144fd2fe7bfa9d159fa47ab76695109cb4d3f01fc5bfa996df4576aee0eebe36a90 DIST gnuplot-5.2.7.tar.gz 5335673 BLAKE2B 6ca3055f6bb2e032562c7f21beda0adca1087598c7bacc9ab187c7ea4a3d85e08598ddb0ff0660bca081bc17899dbb92bbfbb6acde8b7b5367f12da7a2a14b62 SHA512 f6b77e16b25e5705ea9dad4f89ed5f5a3cf95d3e4215da00be3cbfbcdeee23009e9205156399448526783f25b5b7599b674670c94c01345abafeff74f6c7de93 -EBUILD gnuplot-5.0.7.ebuild 5771 BLAKE2B aa00c5538543ee465400fc5f92f72c7fc00c40845f7d1129fa0de468e09e53436de67b1f5105b2cedc3a894cfb4ae29358f6e382caeda9235d65e3f3afe2b92c SHA512 962a8ad43e1635eb845ec0e0ba6f369185410366c69d2685e9236a41fd7bc7a7845a4c31b820e480136298096fc6c3d78d56d23ef88c48d5fcfe66ed752346f4 -EBUILD gnuplot-5.2.6.ebuild 5835 BLAKE2B 42bcdb894058d5023a983dcf1881b29417894aa1149741bd8cb9aeef468f261b2c552bcf6cdbe996e486fcc3b86121b6d5697b7a3647b64dbca48776b5bf3edb SHA512 b1bd2bffe921fccc85637e563dfc5ab2a16a1ac5d3c4a20b6ceeb8c1d0f639d1aa2180faeacd743ffd5d1c07e8c468f7189c19378e755098e1483ba20320a425 -EBUILD gnuplot-5.2.7.ebuild 5835 BLAKE2B 42bcdb894058d5023a983dcf1881b29417894aa1149741bd8cb9aeef468f261b2c552bcf6cdbe996e486fcc3b86121b6d5697b7a3647b64dbca48776b5bf3edb SHA512 b1bd2bffe921fccc85637e563dfc5ab2a16a1ac5d3c4a20b6ceeb8c1d0f639d1aa2180faeacd743ffd5d1c07e8c468f7189c19378e755098e1483ba20320a425 -EBUILD gnuplot-5.2.9999.ebuild 5731 BLAKE2B 776e90f78d35c64393aafe6a0185241c3a0b9c512269d7993e3b94d562af2acd41802737e0835b5e5ba38f108e665bf509cb9048295b5ddca26d9b5f18b991b8 SHA512 2b284ee5634b1fe6e1e365ee5a356f3150a87185f8ee90e7290ab65c7789b0ed035cbfa993e4bf265ebcf2773da3512f030fd19c4c67d2dfcb6136a4c6a4f2c7 -EBUILD gnuplot-5.3.9999.ebuild 5153 BLAKE2B df9dcf40c7a3372f8776c0eddde73c4adf83c19205ff579c16c7939ad08b431f586f38fc99b1790d3697f38db005bd1484c08364a727d5316d79d04d8edcc350 SHA512 cb24bdfe5d09ceead6e59545bd9cfa7da16e8293c8da950a5f793dee64dec8d3684f0df3e90033ade9b82963034da07e839475ae728f2e82d665c55eb090d6d8 +DIST gnuplot-5.2.8.tar.gz 5340677 BLAKE2B 169f5bef44a64b3b7a5be40e28ea22ef24ebc7526fe13ab09e16495453c3922712603d63a03c3b4332368d2ae8cbe4ef57ec53e18bbb4ad2cde13e4cc534245a SHA512 513dff15236dcb58c3c5471cdaa0713242787dbf30ef860c3f69152cb87c6392e4973caff5eb178707bbb84c78548e806b2920864a37686bce49425fbfdc4e8c +EBUILD gnuplot-5.0.7.ebuild 5772 BLAKE2B fdf5b221701cd90e4dd63b7388cd3d0d7eb6b42e14d915d3c43e42bc26daf74b472a796f66223a7fd21ca835d0dcc42946f365f76a6dc5409e6c1c194ab70a3d SHA512 174d485b762c6402020bb3ee3112469ee71ede3a4d3ed3b14deaa6097066b9859e00ddbdb0bb384c4c5022806daae7e1b9d355643eafb6bb58e58006e19d10de +EBUILD gnuplot-5.2.7.ebuild 5836 BLAKE2B 72e616223ae2b2d62aee9a400f8d0166485901e0865b379d5debcdddad26338a549072c72698762ef210ad4ff624e2cb3be13d3bde064fece709ad300d3326bd SHA512 de9463a8d5daf176fb5e9ea186af61b920549ca701aa21ae5e0a51c79743e82bc8507884d255475b2eccbb799872325343843a3bddc81380d9306f9376c07383 +EBUILD gnuplot-5.2.8.ebuild 5853 BLAKE2B c19a82d8b67d705d058ff18ebcb9a534079a312a014a4c0c76c8ade8de080960e121ce96b38a982a9d61a89a44b4cfbfcf424c2eae0e72f27260d00455682507 SHA512 8e2faac332996da556930d83b178d583dbdf5042a4ca2e37f4d2a1179c9bc412476910c9c8a4c05828c2d9bb7b161e3a99d704db07edc74b297b27800873ff79 +EBUILD gnuplot-5.2.9999.ebuild 5742 BLAKE2B 454aafd7166509cccd7711eeb54b2c0af3bbe136d235f5581a8d495944126f9ea4c8d201af1f02aa474a55a31bf023e5f59e61419ac44f4a7c698408b3306908 SHA512 dd5e3197892c2cc99d6fa41230286a3baa62ec67a6c5d2354ba2575ad04b6e779ae601674e11186e485ea34e7561720bbd1e87825af0f272bf14637146120939 +EBUILD gnuplot-5.3.9999.ebuild 5089 BLAKE2B 26f13dee72d3af9a555278fe3be6e5315f66b522f171e08e21fceaa2bb10b82f3895a7f57f12ad7e648b5907a0c161a997196a77655e9fa169a7a909d73d100b SHA512 06d013fc5ba85f85724b077831982e078ea9aa2db41160c6cf5d7f7b7671e5620d854af6af08d765b1ac4eb8b58e8777413e5bf72e9278f43106b04db10d62b9 MISC metadata.xml 1267 BLAKE2B f3b0192ce2cd8d0fb10c2f4fb4bad9780f01746cb283c19e7ecc622c85470ed8a3b7193ca2f7abdee6fdb771719e0c0a9a8a5c7fd9320ef0dae1f1210e7e36cd SHA512 dc9f36a7f2ffb85eeafb41a2b5d0b61746ef3e1de049db18ba351108b887b4cf506ea871754918faae8b4989e5ee7dbfc9f7f48c5b9df55a3bbe782425dc0421 diff --git a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild index 001588328da0..baf70b0bb6a8 100644 --- a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild @@ -19,7 +19,7 @@ if [[ -z ${PV%%*9999} ]]; then else MY_P="${P/_/.}" SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" fi LICENSE="gnuplot" diff --git a/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild index 9002846bcfed..931c3482920f 100644 --- a/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild @@ -17,7 +17,7 @@ if [[ -z ${PV%%*9999} ]]; then else MY_P="${P/_/.}" SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" fi LICENSE="gnuplot" diff --git a/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild index 9002846bcfed..b38b2fc31c42 100644 --- a/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs wxwidgets @@ -17,7 +17,7 @@ if [[ -z ${PV%%*9999} ]]; then else MY_P="${P/_/.}" SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" fi LICENSE="gnuplot" @@ -37,7 +37,8 @@ RDEPEND=" >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( dev-lang/lua:0 ) - qt5? ( dev-qt/qtcore:5= + qt5? ( + dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtprintsupport:5= @@ -52,7 +53,10 @@ RDEPEND=" x11-libs/pango x11-libs/gtk+:2 ) X? ( x11-libs/libXaw )" -DEPEND="${RDEPEND} + +DEPEND="${RDEPEND}" + +BDEPEND=" virtual/pkgconfig doc? ( virtual/latex-base @@ -184,8 +188,8 @@ src_install() { # Demo files insinto /usr/share/${PN}/${GP_VERSION} doins -r demo - rm -f "${ED%/}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile* - rm -f "${ED%/}"/usr/share/${PN}/${GP_VERSION}/demo/binary* + rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile* + rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary* fi if use doc; then diff --git a/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild index 56845ef2630d..4c57d268b612 100644 --- a/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs wxwidgets @@ -37,7 +37,8 @@ RDEPEND=" >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( dev-lang/lua:0 ) - qt5? ( dev-qt/qtcore:5= + qt5? ( + dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtprintsupport:5= @@ -52,7 +53,10 @@ RDEPEND=" x11-libs/pango x11-libs/gtk+:2 ) X? ( x11-libs/libXaw )" -DEPEND="${RDEPEND} + +DEPEND="${RDEPEND}" + +BDEPEND=" virtual/pkgconfig doc? ( virtual/latex-base @@ -181,8 +185,8 @@ src_install() { # Demo files insinto /usr/share/${PN}/${GP_VERSION} doins -r demo - rm -f "${ED%/}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile* - rm -f "${ED%/}"/usr/share/${PN}/${GP_VERSION}/demo/binary* + rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile* + rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary* fi if use doc; then diff --git a/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild index f1ec64c8b8c4..aa399503dd8b 100644 --- a/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs wxwidgets @@ -37,7 +37,8 @@ RDEPEND=" >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( dev-lang/lua:0 ) - qt5? ( dev-qt/qtcore:5= + qt5? ( + dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtprintsupport:5= @@ -51,7 +52,10 @@ RDEPEND=" x11-libs/pango x11-libs/gtk+:2 ) X? ( x11-libs/libXaw )" -DEPEND="${RDEPEND} + +DEPEND="${RDEPEND}" + +BDEPEND=" virtual/pkgconfig doc? ( virtual/latex-base @@ -124,7 +128,6 @@ src_configure() { $(use_with doc tutorial) \ $(use_with gd) \ "$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \ - "$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \ "$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \ $(use_with libcerf) \ $(use_with lua) \ @@ -160,7 +163,7 @@ src_compile() { src_install() { emake DESTDIR="${D}" install - dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README* RELEASE_NOTES TODO + dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES TODO newdoc term/PostScript/README README-ps newdoc term/js/README README-js use lua && newdoc term/lua/README README-lua @@ -170,8 +173,8 @@ src_install() { # Demo files insinto /usr/share/${PN}/${GP_VERSION} doins -r demo - rm -f "${ED%/}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile* - rm -f "${ED%/}"/usr/share/${PN}/${GP_VERSION}/demo/binary* + rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile* + rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary* fi if use doc; then diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest index d3e4f09a2863..fb59a1b7c780 100644 --- a/sci-visualization/gwyddion/Manifest +++ b/sci-visualization/gwyddion/Manifest @@ -1,5 +1,6 @@ AUX gwyddion-2.55-automagic.patch 1441 BLAKE2B 3f6096392742beea11c908035efebb24129ebd8a4c7207f35615c7c1b97842f5ad774bcf24369d50cb7e0270db8b46c39dd4c4074c660dd00e1a2a9150c6fa3a SHA512 6a83a723e5a82c8123b0739aba8d638d641a776fd807f8dedbff68cd035256cf3b1941b89a039bf5fd5ad24b3bf2f25237dc13f89797e7eace0e1832f74a8c7e AUX gwyddion-2.55-mime.patch 726 BLAKE2B fde2a0b132fbc484f905a0c06a9b666b8bd57a33b9804e7db56b58bf543947434e2f15eb82d6c2cddc066bbc575412461b57fd3be4c3668ec35e69af3081b3dc SHA512 8703b8a09fb84a979afef5a921e29af8514318d47d184ece66f3caae45639fa643701be29bc78ea541f13dc7018950f75a5f5c7099ce2275004ddf768b5c68a1 +AUX gwyddion-2.55-xml.patch 603 BLAKE2B e50a97f2c39dbf83aa6dd6cdd9b3a3a1f3a4aa7101b41f57a79d09b2474a8ed9fbd7e1817fdfddc22b27ed11282397b0c118d7f7d610e89f599cc4022ce1065a SHA512 6f8943247493518f85159ce259305bf2e822ee16d5d334c342955b1fb183a491202c8db879b8cfd8f5d95a4ee2fb709ee1e0221c8fe10d2f11b6f7457051b6b5 DIST gwyddion-2.55.tar.xz 4607560 BLAKE2B 30489d980d3feb6986be4041b59c847673ee589674d5913b4508f28f072eb2f570b98f0b1be01dcf6e1d45e86607582967fd83fe3c859172fcdef3c7bffae741 SHA512 680c33b1f7d36de31274869e7f0af9c06030e04779d6b59f06860ae3f47db4ad45bbf3ee2219bb7b6c01807a807aeafa4f5d0aefe20601e0dda1011acf59fc8e -EBUILD gwyddion-2.55-r2.ebuild 1557 BLAKE2B d416e4970e7fc6b2ac16b6b0193b23a1eeda1234cc8660f7eb0fd33b3a7cb8d17211cffd09806b4a0ecf774d93abafb8696104c41948124d4bb1725f842746ce SHA512 645959f0196192f08d16534674f45dc437b2fec0ccc89971dc14551f2d7ee7747547f569941d332d4bba43688a7dbb940f0ae06be2eaa9aa68f96501ff4436be +EBUILD gwyddion-2.55-r4.ebuild 1593 BLAKE2B c814b8d1298723a73b4d3dc3c07be13a5394029c230d5964412320c7e57ce45173ce6e67ce919ede30c8f760c1315ad515bab550349796c96750439e0e0203d3 SHA512 c89856d8061168bc4800484adefbb48484bcdabe7030621935227885bd5d107ad26c506b867233705bad8b8bc3610d587256c6919e550c857e94f9cea1f9229a MISC metadata.xml 938 BLAKE2B a6bdd3f5aa17f3846d6e44ebbb6f7e230253df851819bd3ce27be44d6e288590f149576fb2bbd8e19ad04c757d58675f6b96d57571c0c92eae8dde432a08b2ee SHA512 2e90996291b1a4ca744a87af2621e3f8afcf39660a550e82d1b018ffffc41123897a923702ba61718ca97586d95672dee8777579cc4f666e57df88e534f555b1 diff --git a/sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch b/sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch new file mode 100644 index 000000000000..3cebcc684b50 --- /dev/null +++ b/sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch @@ -0,0 +1,15 @@ +diff --git a/data/gwyddion.xml b/data/gwyddion.xml +index d26089f..acb7b90 100644 +--- a/data/gwyddion.xml ++++ b/data/gwyddion.xml +@@ -55,8 +55,8 @@ + <comment>Ambios XML profile data</comment> + <magic priority="80"> + <match type="string" offset="0" value="<?xml"> +- <match type="string" offset="40:120" value="<ProfilometerData>"> +- <match type="string" offset="60:140" value="<Header>"/> ++ <match type="string" offset="40:120" value="<ProfilometerData>"> ++ <match type="string" offset="60:140" value="<Header>"/> + </match> + </match> + </magic> diff --git a/sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild b/sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild index 81eb34a955ae..335e80a5c600 100644 --- a/sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild +++ b/sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild @@ -39,6 +39,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-2.55-automagic.patch" "${FILESDIR}/${PN}-2.55-mime.patch" + "${FILESDIR}/${PN}-2.55-xml.patch" ) src_prepare() { diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest index 3321cead4c10..dce1ce25c0fb 100644 --- a/sci-visualization/paraview/Manifest +++ b/sci-visualization/paraview/Manifest @@ -1,7 +1,6 @@ AUX paraview-4.0.1-xdmf-cstring.patch 360 BLAKE2B 919de8333b22125dd1122987f780ad65594982f4fd403c45a80ae1294d1acb11cda61adc8c62f97243651679b044130e94850ecd9e06f26da1c538268fd02ba8 SHA512 5577b7bae26959546795721d712c4e4f6a5403b35c0871040f6c74c07cd3aecd5b03e9f7a07ef49714b8adb4c7cc880385215b8742895006d2ad3dfeccc50472 AUX paraview-5.3.0-fix_buildsystem.patch 797 BLAKE2B f77c72f34c13eae42a4da281f954808f7db47c7765b9084a99d2e0ea6297d30092d1b3dae7ab26df7ac1e4de6559805748c0994853e2ad34c0f8f639ce732b12 SHA512 18526dc29219fd8dbc3679920ce271977cfb153a51cf217d49ba544510da23ee02f57b3ee9450ad9ee421d272a18fecdf3bd5043225cc16d04a2b115f62ce1f0 AUX paraview-5.5.0-allow_custom_build_type.patch 1036 BLAKE2B ff00093034196935e9075c5751f8a64027da009679de5c3f5b941681e65df9b91b0a05a3f0201a873313d859f029596739b1c5d705a1c35ae3cc83251312774e SHA512 0c79315d28b98d4cf45bfd48198dbb3315ebf6ffbd05e9720b35e7bdea05bd98c086dbb02cd7ac6d9580f504c7d29f498244d2b30d9e2932e881261a78b020c7 -AUX paraview-5.6.1-fix_openmp_4.0.patch 3790 BLAKE2B 1da9193af5022e543d794802c50b868a4cf12f5a0943787d845b9b90540efe63d4952df588dc033a8d60978dd109801c3c791460c020bf811dfa5e1c7e028c07 SHA512 fa197c29d5e175c0f0743d3b820ee1be6cf3b1cff21cc98941d853693c0875e200b0ace67c9405a724c356646d8d302193af2226e936b97688dec553ce673b3d -DIST ParaView-v5.6.1.tar.xz 38756076 BLAKE2B 65515a61493e5b9518c42b8b255c59086629bc863de9bfd5651b06ea96dce108ce93f559192d76411bfacaa93660add8ee181e68c46e36ba26b65d32dc141534 SHA512 33ca0b29d4dae8f2ecdad3148c30b5cecb4dc64a4fc898206f5f855cacbc18e554c86d6e259b39fb2f56d190cf76cdefe103009b233ce04ad2573caa34b9ca45 -EBUILD paraview-5.6.1-r1.ebuild 8689 BLAKE2B fb1153248908e538e9b94fa5970f77d98356ec9f3295b69f47f1f3377166ea955eeac39951d1d369e0159bed618bcd42b1386bbc2dd43ba09c83ea88aeb55a6a SHA512 212bf2665707e2d623305fe9ac01bb7095208443b404a8c1f64e3500d9c64504b7ab06424c9cd7aeaf476c8b3eaead90f458537c5c1235701faa0f639832df32 -MISC metadata.xml 817 BLAKE2B 8a28d48b1c9f543a90ca28f59c1f943ab0943c25457749a3f8b9a638b63a6703b8ec339ce35abe1fcca74963fbbddac96742094e036431d57d8763c494e4ac04 SHA512 fcc3c91bde9894d1d49b7845c2aca2b3d7ceba09b503b57405ba870a1a414fe7b280313844a2932d80d8d96987b035d948ce219032710e347181db8e3c9738ca +DIST ParaView-v5.8.0.tar.xz 49789116 BLAKE2B 25689220f506221731bb5a56c647c249df0de8654a4b3347a7c09067bb5755818597bd7cfff88c2d129f448189b107079995c93599d482f7bf8b4cc6c7430e72 SHA512 43304d62c3f55bc390e68c033fb4c7dc2c0789d0dadbb98ef734b7d9de0419af4c240ce94f36e2b52c939ac950fba1d70dbd9fc3a1e6da37c7ef847b5c8682a2 +EBUILD paraview-5.8.0-r2.ebuild 6270 BLAKE2B c580e71f4d3b32d806cc0a5045ce4c067d3db540c9a8aea1992e5db79e9ca9836d1a131660f43eaae1e7ee237b09aa7dc76a2d514533b465e12a5d128e9b43ad SHA512 0665d569ae2bfcc1f3ee24c178323c796b497c036cb49862fec581fa08160728b968ef994fd55d591ceea99bf2115f53392bad2508c574028cea62f677b0d414 +MISC metadata.xml 873 BLAKE2B 3f48aa66e19a19e8de7959d58248e7d4d7b6ca0f9dd98b869088f15bfc483dec486c89bdd448368eb0b385735ca8cfb3462a86e93fecb13383366ced4ead4ebd SHA512 871830a5157bc1f8803cf4dbd4797a58bd87d6338a3eaa21662a2e789412bf746c30f817a485a26b4b14fa578aa15b391efe76c920db7b1c2a2f74f9bf3eceb2 diff --git a/sci-visualization/paraview/files/paraview-5.6.1-fix_openmp_4.0.patch b/sci-visualization/paraview/files/paraview-5.6.1-fix_openmp_4.0.patch deleted file mode 100644 index cf2150708935..000000000000 --- a/sci-visualization/paraview/files/paraview-5.6.1-fix_openmp_4.0.patch +++ /dev/null @@ -1,81 +0,0 @@ -From e30cb0872593d1614392817762b871de36e4c2f3 Mon Sep 17 00:00:00 2001 -From: Allison Vacanti <allison.vacanti@kitware.com> -Date: Thu, 27 Jun 2019 16:04:53 -0400 -Subject: [PATCH] Fix OpenMP for gcc-9 backwards incompatibility. - -For details, see - -https://www.gnu.org/software/gcc/gcc-9/porting_to.html ---- - vtkm/cont/openmp/internal/FunctorsOpenMP.h | 18 +++++++++++++++--- - vtkm/cont/openmp/internal/ParallelSortOpenMP.h | 4 +++- - 2 files changed, 18 insertions(+), 4 deletions(-) - -diff --git ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h b/vtkm/cont/openmp/internal/FunctorsOpenMP.h -index 27cd2bc0..0271754c 100644 ---- ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h -+++ ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h -@@ -36,6 +36,18 @@ - #define VTKM_OPENMP_DIRECTIVE(directive) - #endif // _OPENMP - -+// See "OpenMP data sharing" section of -+// https://www.gnu.org/software/gcc/gcc-9/porting_to.html. OpenMP broke -+// backwards compatibility regarding const variable handling. -+// tl;dr, put all const variables accessed from openmp blocks in a -+// VTKM_OPENMP_SHARED_CONST(var1, var2, ...) macro. This will do The Right Thing -+// on all gcc. -+#if defined(__GNUC__) && __GNUC__ >= 9 -+#define VTKM_OPENMP_SHARED_CONST(...) shared(__VA_ARGS__) -+#else -+#define VTKM_OPENMP_SHARED_CONST(...) -+#endif -+ - // When defined, supported type / operator combinations will use the OpenMP - // reduction(...) clause. Otherwise, all reductions use the general - // implementation with a manual reduction once the threads complete. -@@ -279,8 +291,8 @@ struct ReduceHelper - int numThreads = 0; - std::unique_ptr<ReturnType[]> threadData; - -- VTKM_OPENMP_DIRECTIVE(parallel default(none) firstprivate(f) -- shared(data, doParallel, numThreads, threadData)) -+ VTKM_OPENMP_DIRECTIVE(parallel default(none) firstprivate(f) shared( -+ data, doParallel, numThreads, threadData) VTKM_OPENMP_SHARED_CONST(numVals)) - { - - int tid = omp_get_thread_num(); -@@ -412,7 +424,7 @@ void ReduceByKeyHelper(KeysInArray keysInArray, - vtkm::Id outIdx = 0; - - VTKM_OPENMP_DIRECTIVE(parallel default(none) firstprivate(keysIn, valuesIn, keysOut, valuesOut, f) -- shared(outIdx)) -+ shared(outIdx) VTKM_OPENMP_SHARED_CONST(numValues)) - { - int tid = omp_get_thread_num(); - int numThreads = omp_get_num_threads(); -diff --git a/vtkm/cont/openmp/internal/ParallelSortOpenMP.h b/vtkm/cont/openmp/internal/ParallelSortOpenMP.h -index e06d1762..a973eee6 100644 ---- ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h -+++ ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h -@@ -123,7 +123,8 @@ void parallel_sort_bykey(vtkm::cont::ArrayHandle<T, StorageT>& keys, - VTKM_OPENMP_DIRECTIVE(parallel for - default(none) - firstprivate(valuesInPortal, indexPortal, valuesOutPortal) -- schedule(static)) -+ schedule(static) -+ VTKM_OPENMP_SHARED_CONST(size)) - for (vtkm::Id i = 0; i < size; ++i) - { - valuesOutPortal.Set(i, valuesInPortal.Get(indexPortal.Get(i))); -@@ -209,6 +210,7 @@ void parallel_sort_bykey(vtkm::cont::ArrayHandle<T, StorageT>& keys, - VTKM_OPENMP_DIRECTIVE(parallel for - default(none) - firstprivate(valuesInPortal, indexPortal, valuesOutPortal) -+ VTKM_OPENMP_SHARED_CONST(size) - schedule(static)) - for (vtkm::Id i = 0; i < size; ++i) - { --- -2.21.0 - diff --git a/sci-visualization/paraview/metadata.xml b/sci-visualization/paraview/metadata.xml index f5e4c3c6676a..8b232e108f44 100644 --- a/sci-visualization/paraview/metadata.xml +++ b/sci-visualization/paraview/metadata.xml @@ -1,17 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>tamiko@gentoo.org</email> - <name>Matthias Maier</name> - </maintainer> - <use> - <flag name="boost">Enable the usage of dev-libs/boost</flag> - <flag name="cg">Add support for nvidia's cg shaders</flag> - <flag name="coprocessing">Enable the coprocessing infrastructure which is mainly useful in the context of clusters</flag> - <flag name="development">Install development files including headers</flag> - <flag name="nvcontrol">Add NVCONTROL support for OpenGL options</flag> - <flag name="offscreen">Offscreen rendering through OSMesa</flag> - <flag name="plugins">Build and install additional plugins</flag> - </use> + <maintainer type="person"> + <email>tamiko@gentoo.org</email> + <name>Matthias Maier</name> + </maintainer> + <use> + <flag name="boost">Enable the usage of dev-libs/boost</flag> + <flag name="cg">Add support for nvidia's cg shaders</flag> + <flag name="coprocessing">Enable the coprocessing infrastructure which is mainly useful in the context of clusters</flag> + <flag name="development">Install development files including headers</flag> + <flag name="nvcontrol">Add NVCONTROL support for OpenGL options</flag> + <flag name="offscreen">Offscreen rendering through OSMesa</flag> + <flag name="plugins">Build and install additional plugins</flag> + <flag name="webengine">Add support for <pkg>dev-qt/qtwebengine</pkg></flag> + </use> </pkgmetadata> diff --git a/sci-visualization/paraview/paraview-5.6.1-r1.ebuild b/sci-visualization/paraview/paraview-5.8.0-r2.ebuild index 6233e8195c65..0de4586ea318 100644 --- a/sci-visualization/paraview/paraview-5.6.1-r1.ebuild +++ b/sci-visualization/paraview/paraview-5.8.0-r2.ebuild @@ -17,13 +17,16 @@ SRC_URI="https://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.xz" LICENSE="paraview GPL-2" KEYWORDS="~amd64 ~x86" SLOT="0" -IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp offscreen plugins python +qt5 sqlite tcl test tk" +IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp offscreen plugins python +qt5 +sqlite test tk +webengine" RESTRICT="mirror test" # "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL" -REQUIRED_USE="python? ( mpi ${PYTHON_REQUIRED_USE} ) +REQUIRED_USE=" + python? ( mpi ${PYTHON_REQUIRED_USE} ) mysql? ( sqlite ) + webengine? ( qt5 ) + qt5? ( sqlite ) ?? ( offscreen qt5 )" RDEPEND=" @@ -50,10 +53,8 @@ RDEPEND=" x11-libs/libXmu x11-libs/libXt coprocessing? ( - plugins? ( - dev-python/PyQt5 - dev-qt/qtgui:5[-gles2] - ) + dev-python/PyQt5 + dev-qt/qtgui:5[-gles2-only] ) ffmpeg? ( virtual/ffmpeg ) mpi? ( virtual/mpi[cxx,romio] ) @@ -70,27 +71,25 @@ RDEPEND=" dev-python/pygments[${PYTHON_MULTI_USEDEP}] dev-python/sip[${PYTHON_MULTI_USEDEP}] dev-python/six[${PYTHON_MULTI_USEDEP}] - || ( dev-python/twisted[${PYTHON_MULTI_USEDEP}] - dev-python/twisted-core[${PYTHON_MULTI_USEDEP}] - ) + dev-python/twisted[${PYTHON_MULTI_USEDEP}] dev-python/zope-interface[${PYTHON_MULTI_USEDEP}] mpi? ( dev-python/mpi4py ) - qt5? ( dev-python/PyQt5[opengl,webkit,${PYTHON_MULTI_USEDEP}] ) + qt5? ( dev-python/PyQt5[opengl,${PYTHON_MULTI_USEDEP}] ) ') ) qt5? ( dev-qt/designer:5 - dev-qt/qtgui:5[-gles2] + dev-qt/qtgui:5[-gles2-only] dev-qt/qthelp:5 - dev-qt/qtopengl:5[-gles2] + dev-qt/qtopengl:5[-gles2-only] dev-qt/qtsql:5 dev-qt/qttest:5 - dev-qt/qtwebengine:5[widgets] dev-qt/qtx11extras:5 + dev-qt/qtxmlpatterns:5 ) sqlite? ( dev-db/sqlite:3 ) - tcl? ( dev-lang/tcl:0= ) - tk? ( dev-lang/tk:0= )" + tk? ( dev-lang/tk:0= ) + webengine? ( dev-qt/qtwebengine:5[widgets] )" DEPEND="${RDEPEND} ${PYTHON_DEPS} boost? ( @@ -106,14 +105,13 @@ PATCHES=( "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch "${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch "${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch - "${FILESDIR}"/${PN}-5.6.1-fix_openmp_4.0.patch ) CMAKE_MAKEFILE_GENERATOR="emake" #579474 pkg_setup() { [[ ${MERGE_TYPE} != "binary" ]] && use openmp && tc-check-openmp - python-single-r1_pkg_setup + use python && python-single-r1_pkg_setup PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV} } @@ -130,7 +128,7 @@ src_prepare() { VTK/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt || die sed -i \ -e "s:lib/paraview-:$(get_libdir)/paraview-:g" \ - ParaViewCore/ServerManager/SMApplication/vtkInitializationHelper.cxx || die + Remoting/Application/vtkInitializationHelper.cxx || die } src_configure() { @@ -140,41 +138,27 @@ src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}" - -DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include - -DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so - -DBUILD_SHARED_LIBS=ON + -UBUILD_SHARED_LIBS + -DPARAVIEW_BUILD_SHARED_LIBS=ON -DCMAKE_VERBOSE_MAKEFILE=ON - -DVTK_Group_StandAlone=ON -DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN=TRUE -DVTK_USE_OGGTHEORA_ENCODER=TRUE - -DVTK_USE_SYSTEM_CGNS=ON - -DVTK_USE_SYSTEM_PUGIXML=ON - -DVTK_USE_SYSTEM_EXPAT=ON - -DVTK_USE_SYSTEM_FREETYPE=ON - -DVTK_USE_SYSTEM_GL2PS=OFF # doesn't compile, requires modified sources - -DVTK_USE_SYSTEM_GLEW=ON - -DVTK_USE_SYSTEM_HDF5=ON - -DVTK_USE_SYSTEM_JPEG=ON - -DVTK_USE_SYSTEM_JSONCPP=ON - -DVTK_USE_SYSTEM_LIBXML2=ON - -DVTK_USE_SYSTEM_LZ4=ON - -DVTK_USE_SYSTEM_NETCDF=ON - -DVTK_USE_SYSTEM_PNG=ON - -DVTK_USE_SYSTEM_PROTOBUF=ON - -DVTK_USE_SYSTEM_TIFF=ON - -DVTK_USE_SYSTEM_XDMF2=OFF # does not compile with sci-libs/xdmf2-1.0_p141226 - -DVTK_USE_SYSTEM_ZLIB=ON + + -DVTK_GROUP_ENABLE_Imaging=YES + -DVTK_GROUP_ENABLE_Rendering=YES + -DVTK_GROUP_ENABLE_StandAlone=YES + -DVTK_GROUP_ENABLE_Views=YES # boost - -DModule_vtkInfovisBoost="$(usex boost)" + -DVTK_MODULE_ENABLE_VTK_IOInfovis="$(usex boost YES NO)" # coprocessing - -DPARAVIEW_ENABLE_CATALYST="$(usex coprocessing)" +# -DVTK_MODULE_ENABLE_ParaView_Catalyst="$(usex coprocessing YES NO)" # doc - -DBUILD_DOCUMENTATION="$(usex doc)" + -DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION="$(usex doc)" # examples -DBUILD_EXAMPLES="$(usex examples)" @@ -182,100 +166,58 @@ src_configure() { # ffmpeg -DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)" -DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)" - -DModule_vtkIOFFMPEG="$(usex ffmpeg)" # mpi - -DPARAVIEW_USE_ICE_T="$(usex mpi)" - -DPARAVIEW_USE_MPI_SSEND="$(usex mpi)" -DPARAVIEW_USE_MPI="$(usex mpi)" - -DVTK_Group_MPI="$(usex mpi)" - -DVTK_XDMF_USE_MPI="$(usex mpi)" -DXDMF_BUILD_MPI="$(usex mpi)" + -DVTK_GROUP_ENABLE_MPI="$(usex mpi YES NO)" # mysql - -DModule_vtkIOMySQL="$(usex mysql)" + -DVTK_MODULE_ENABLE_VTK_IOMySQL="$(usex mysql YES NO)" # offscreen - -DVTK_USE_X=$(usex !offscreen) - -DVTK_OPENGL_HAS_OSMESA=$(usex offscreen) - -DVTK_OPENGL_HAS_OSMESA=$(usex offscreen) + -DVTK_USE_X="$(usex !offscreen)" + -DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)" + -DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)" # plugins - -DPARAVIEW_BUILD_PLUGIN_AdiosReader="$(usex plugins)" - -DPARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO="$(usex plugins)" - -DPARAVIEW_BUILD_PLUGIN_ArrowGlyph="$(usex plugins)" - -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting="$(usex plugins)" - -DPARAVIEW_BUILD_PLUGIN_GMVReader="$(usex plugins)" - -DPARAVIEW_BUILD_PLUGIN_Moments="$(usex plugins)" - -DPARAVIEW_BUILD_PLUGIN_NonOrthogonalSource="$(usex plugins)" - -DPARAVIEW_BUILD_PLUGIN_PacMan="$(usex plugins)" - -DPARAVIEW_BUILD_PLUGIN_SierraPlotTools="$(usex plugins)" - -DPARAVIEW_BUILD_PLUGIN_SLACTools="$(usex plugins)" - -DPARAVIEW_BUILD_PLUGIN_StreamingParticles="$(usex plugins)" - -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC="$(usex plugins)" - # these are always needed for plugins - -DModule_vtkFiltersFlowPaths="$(usex plugins)" - -DModule_vtkPVServerManagerApplication="$(usex plugins)" - # force this module due to incorrect build system deps wrt bug 460528 - -DModule_vtkUtilitiesProcessXML=ON + -DPARAVIEW_PLUGINS_DEFAULT="$(usex plugins)" # python -DModule_pqPython="$(usex python)" - -DModule_vtkmpi4py="$(usex python)" - -DModule_vtkPython="$(usex python)" - -DModule_vtkWrappingPythonCore="$(usex python)" - -DPARAVIEW_ENABLE_PYTHON="$(usex python)" - -DXDMF_WRAP_PYTHON="$(usex python)" + -DPARAVIEW_USE_PYTHON="$(usex python)" # qt5 -DPARAVIEW_INSTALL_DEVELOPMENT_FILES="$(usex development)" - -DModule_vtkGUISupportQtSQL="$(usex qt5)" - -DModule_vtkRenderingQt="$(usex qt5)" - -DModule_vtkViewsQt="$(usex qt5)" - -DPARAVIEW_BUILD_QT_GUI="$(usex qt5)" - -DVTK_Group_ParaViewQt="$(usex qt5)" - -DVTK_Group_Qt="$(usex qt5)" + -DPARAVIEW_USE_QT="$(usex qt5)" -DModule_pqPython="$(usex qt5 "$(usex python)" "off")" - $(usex qt5 "-DPARAVIEW_QT_VERSION=5" "") -DVTK_USE_NVCONTROL="$(usex nvcontrol)" + -DVTK_GROUP_ENABLE_Qt="$(usex qt5 YES NO)" # sqlite - -DModule_vtksqlite="$(usex sqlite)" - - # tcl - -DModule_vtkTclTk="$(usex tcl)" + -DVTK_MODULE_ENABLE_VTK_sqlite="$(usex sqlite YES NO)" # test -DBUILD_TESTING="$(usex test)" # tk - -DVTK_Group_Tk="$(usex tk)" -DVTK_USE_TK="$(usex tk)" - -DModule_vtkRenderingTk="$(usex tk)" + -DVTK_GROUP_ENABLE_Tk="$(usex tk YES NO)" + + # webengine + -DPARAVIEW_USE_QTWEBENGINE="$(usex webengine)" + -DVTK_GROUP_ENABLE_Web="$(usex webengine YES NO)" ) if use openmp; then mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP ) fi - if use python; then - mycmakeargs+=( - -DVTK_USE_SYSTEM_TWISTED=ON - -DVTK_USE_SYSTEM_AUTOBAHN=ON - -DVTK_USE_SYSTEM_ZOPE=ON - ) - fi - if use qt5; then mycmakeargs+=( - -DVTK_USE_QVTK=ON -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so - -DVTK_QT_VERSION=5 -DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc" - -DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic" - -DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake" - -DVTK_Group_Qt:BOOL=ON ) fi @@ -292,17 +234,11 @@ src_install() { fi done - # install libraries into correct directory respecting get_libdir: - mv "${ED}"/usr/lib "${ED}"/usr/lib_tmp || die - mkdir -p "${ED}"/usr/"${PVLIBDIR}" || die - mv "${ED}"/usr/lib_tmp/* "${ED}"/usr/"${PVLIBDIR}" || die - rmdir "${ED}"/usr/lib_tmp || die - # set up the environment echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die doenvd "${T}"/40${PN} - newicon "${S}"/Applications/ParaView/pvIcon-32x32.png paraview.png + newicon "${S}"/Clients/ParaView/pvIcon-96x96.png paraview.png make_desktop_entry paraview "Paraview" paraview use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV} diff --git a/sci-visualization/pythonprop/Manifest b/sci-visualization/pythonprop/Manifest index d37b02f534bb..6ea399cc73d1 100644 --- a/sci-visualization/pythonprop/Manifest +++ b/sci-visualization/pythonprop/Manifest @@ -1,5 +1,3 @@ -DIST pythonprop-0.13.tar.gz 217721 BLAKE2B bd22106e528267ea49e1f68e22ad03958bd064aa4009a5da01a7943dedc7f4e84b8e8dfe8bfc80bc0fe248457cdef69df1d471017c9626757a764aad52e1ccb3 SHA512 b637f48369c926c8dd680a433d46236dc4fa70be79b2325d8f82e320b2d75b1e6d7d992bd81022d27fb6ab118d92178c7ad5ad94f6011a396e4a28d7431bbf2b -DIST pythonprop-0.18.tar.gz 1158035 BLAKE2B 3a01eb72ccfc3d0ebc356c4518d570544cedb01c5dff02ba55dd6be02b529bb4e6cf53346f74ac0dc21cf0662b107f58a064a704c124024c98419f330846868a SHA512 2ca796f215e5aab33bee7dd161358c3065b464587597363dee9f03758cf666cca1b70f5b83e8ac266e21f77b806711cb6f48a1d7c3cd0b97f1461e897f5f9f80 -EBUILD pythonprop-0.13.ebuild 707 BLAKE2B 346d26ab57dc035cd0cd0702f30e8a201b69b329782707128a5a52639c13fda0cc9947fee9b6cde5ab479ef4454c576255f3f82cf56531d54360937f2f279d10 SHA512 4e566488966c2373bab3c039e0b12ee87f7e75b756032143fb73c752bd88c46750197fec85bc39f8c3619c0afb7521bf6f2f280fe2df98f3e814b292574a1790 -EBUILD pythonprop-0.18-r2.ebuild 984 BLAKE2B f9e9ed2187e5925fdea3736ce3c52c34c38129bbc3e4bd8a43e56f5fdc1bcce4e3b5082f32593aaa2541d4b3cf269a63928f0964788a999f7b8ebcd911f5f1ac SHA512 04de410ce6566ed674af8ddd97500b19ae0220f133a403beeb30aaba2fb74a6ae5a82bdfbf9c6c8b6e48bf317fe4a4fca5653eaea3a25d8ff464c9e37b779466 +DIST pythonprop-0.29.tar.gz 586118 BLAKE2B ac018f147206b59fbd2295e6e72d6e1a801d6456d8a9784bdb2511b0d9dcecfa455363826680051c90e0fcc83fdc95a16c91df120efb2e70456958276967dec7 SHA512 2fbbffedc9e010fdebeed7a84d23c599a2532ae0b67e6a2ba2da6bea0dc0496cb1f71ac54650285ed35196f33e689fc3d967e3bd7c4fb16832fc484a6b777fcb +EBUILD pythonprop-0.29.ebuild 1117 BLAKE2B 84351e931bdaa3478dd116f24a77c6d7e060076cdcdfb1d91ee4d9f5a735d301b758be4f9f2755f85c746d2f924102a9872720824e170c3613e71f40a6d7a020 SHA512 5488c446f456ca9c2a457bb89cc5d70df815f94648bf372c21772a627ff9840cb041da7b224fe21e6fb485194eb396b286eaa24a737fb954d2c4a1365ec05d06 MISC metadata.xml 459 BLAKE2B dbf50a4c24f4a4dc0b27d087e0f0942ef7826ed8fcb858fd9744371f906bc5e1ff727a37db157705f5ebf630e744ce21bf9fc578e59eaaa6170215066b85a681 SHA512 23f2836015bd753b0a4957be9efa3347d2f5c6b79ec041465120aa9e8e6565397ba343ea8a393273eaab3c146b8555914b4a1e8bba2a0c4596bc49833388e8f1 diff --git a/sci-visualization/pythonprop/pythonprop-0.13.ebuild b/sci-visualization/pythonprop/pythonprop-0.13.ebuild deleted file mode 100644 index 729017cea4fc..000000000000 --- a/sci-visualization/pythonprop/pythonprop-0.13.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit python-single-r1 - -DESCRIPTION="Scripts to prepare and plot VOACAP propagation predictions" -HOMEPAGE="http://www.qsl.net/hz1jw/pythonprop" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - || ( - dev-python/matplotlib-python2[gtk2,${PYTHON_MULTI_USEDEP}] - dev-python/matplotlib[gtk2,${PYTHON_MULTI_USEDEP}] - ) - ') - dev-python/basemap[${PYTHON_SINGLE_USEDEP}] - sci-electronics/voacapl -" -DEPEND="${RDEPEND}" diff --git a/sci-visualization/pythonprop/pythonprop-0.18-r2.ebuild b/sci-visualization/pythonprop/pythonprop-0.29.ebuild index 4f8e8ef1e524..d5c64040e9af 100644 --- a/sci-visualization/pythonprop/pythonprop-0.18-r2.ebuild +++ b/sci-visualization/pythonprop/pythonprop-0.29.ebuild @@ -1,15 +1,15 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_6 ) -inherit python-single-r1 +inherit autotools python-single-r1 DESCRIPTION="Scripts to prepare and plot VOACAP propagation predictions" -HOMEPAGE="http://www.qsl.net/hz1jw/pythonprop" -SRC_URI="http://www.qsl.net/h/hz1jw/${PN}/downloads/${P}.tar.gz" +HOMEPAGE="https://www.qsl.net/h/hz1jw/pythonprop" +SRC_URI="https://github.com/jawatson/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" @@ -20,12 +20,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" ${PYTHON_DEPS} $(python_gen_cond_dep ' - || ( - dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}] - dev-python/matplotlib[${PYTHON_MULTI_USEDEP}] - ) + dev-python/matplotlib[${PYTHON_MULTI_USEDEP}] + sci-libs/cartopy[${PYTHON_MULTI_USEDEP}] ') - dev-python/basemap[${PYTHON_SINGLE_USEDEP}] + dev-python/cairocffi sci-electronics/voacapl " DEPEND="${RDEPEND} @@ -34,8 +32,18 @@ DEPEND="${RDEPEND} " src_prepare() { + eapply_user + + # drop building *.pdf files + sed -i -e "s#docs/user/help##g" Makefile.am || die # do not call update_destop_database here - sed -ie "s/UPDATE_DESKTOP = /UPDATE_DESKTOP = # /g" data/Makefile.in || die + sed -ie "s/UPDATE_DESKTOP = /UPDATE_DESKTOP = # /g" data/Makefile.am || die # fix Desktop Entry sed -ie "s/HamRadio/HamRadio;/g" data/voacapgui.desktop.in || die + eautoreconf +} + +src_install() { + default + python_optimize } diff --git a/sci-visualization/tensorboard/Manifest b/sci-visualization/tensorboard/Manifest index d2f14353fe7a..41d895d8ba24 100644 --- a/sci-visualization/tensorboard/Manifest +++ b/sci-visualization/tensorboard/Manifest @@ -1,7 +1,7 @@ DIST tensorboard-1.15.0.zip 3765194 BLAKE2B 54a9987b65d4e2b127789f0e66eb5bdef8c024d19a82867632b44eefc4718bc6eb6c68fa61fdb2306af2c3adbacc3c75ec15f7aa331038b15cec27af2d846f85 SHA512 7b47d60929b4be91b4d56e36fc5a19b79511b8f3a1081fe308d3a107f978f2c5d23ad2d209104de983bc44f4506cdb0cb6e09b37e552dc042600ea16e14827dc DIST tensorboard-2.0.0.zip 3776140 BLAKE2B 2bfd5b9d5b1c21f7df19ce5dae8a3d72381092630d1f53409fa0b96cab56be323ddef116bab95184d045f82fec88f4162e1f7277b25ed9c19b77189cf1a132ba SHA512 e87ea39eae9b64c3314de771de98c21148517aee4103a4bc23d674273b1a220248d6ba85a9f94481c6d67e8d3733af099b91df3dae38537411082c1595aad73d DIST tensorboard-2.1.0.zip 3835182 BLAKE2B c2c7dbc1ba4b85c52df6e693e1bd425bd76fe6db7ca25582b57d9c65c68b191dcdba2623ab0560139f1cac1bdf5c7a47261daaaf51fca46f2c5bf441f832a6fd SHA512 7463ace0863b90312a62a7fa96f4eca0147e85cf46ff21729f8996a794d54e14d876d3abe083d6aa4efd8e4e1582f7d5029de367f199981a34d4057b558bc51c -EBUILD tensorboard-1.15.0.ebuild 1727 BLAKE2B 7778041f42cff7fe3ed397a674e74a00815f0f16d48a228de2bb5541df362366a3072afc24b0a5fdb97523709c89287d752dee70057bd799048c69d50c3ff50e SHA512 9039002ee8f46f944a16f197556bbacb524bbcef7a74ae83f172ff7932cf2aa744e5c966826bce78ce4495d75dcc17c57d221bd97cb5e603e08b2c2365895cd7 -EBUILD tensorboard-2.0.0.ebuild 1727 BLAKE2B 7778041f42cff7fe3ed397a674e74a00815f0f16d48a228de2bb5541df362366a3072afc24b0a5fdb97523709c89287d752dee70057bd799048c69d50c3ff50e SHA512 9039002ee8f46f944a16f197556bbacb524bbcef7a74ae83f172ff7932cf2aa744e5c966826bce78ce4495d75dcc17c57d221bd97cb5e603e08b2c2365895cd7 -EBUILD tensorboard-2.1.0-r1.ebuild 1878 BLAKE2B b5a2c5ea2331234278d9f093ccce4b0685cc21205e9115088d3c14e38fd3401099437c66d7b3b25ecd0dddded134d24a43bba10f37d1c38b4a303406150db358 SHA512 9de28409a09cc2332abc874f00d43cd8d79b52be6d72cf5fd297a93aef05e6c34487dcfe4cda12592a2b4ef7269cb866ce7ccd76436a3ee2dd71aa3730a77de6 +EBUILD tensorboard-1.15.0.ebuild 1685 BLAKE2B e7536cba5194bf668923f2db6ec8be419060f9dea9dabb33a4a10befb37f810175560a9d0203f923e2418f1c41fa92b357bd4348d45f6e5c2e8bd96d8918c4cb SHA512 2a484736a0c47fd7347ef5e278ac304acaaa5170007174bde2f48eada5d146b66ffcc0eaf67c1d8c1ee3ed57669c94b045c3f7523b8fb4d2edbc63fa2b2fdeb3 +EBUILD tensorboard-2.0.0.ebuild 1685 BLAKE2B e7536cba5194bf668923f2db6ec8be419060f9dea9dabb33a4a10befb37f810175560a9d0203f923e2418f1c41fa92b357bd4348d45f6e5c2e8bd96d8918c4cb SHA512 2a484736a0c47fd7347ef5e278ac304acaaa5170007174bde2f48eada5d146b66ffcc0eaf67c1d8c1ee3ed57669c94b045c3f7523b8fb4d2edbc63fa2b2fdeb3 +EBUILD tensorboard-2.1.0-r1.ebuild 1836 BLAKE2B 266792447328fc11b51052f61db05376bed5bf3c57875c82f7c24ddf3af13a4f1c3f40967481aefcea1ed3f31c9d0f296c0c01fc3863fdb17d929d9664dd8dd3 SHA512 ed297313f2164848777561147a93daa40efb9eef47b0408f45a926f29bc44385dc57d17897ce9bcba128837446dc8bdc07b42dd91e933506173186866a85b3e0 MISC metadata.xml 494 BLAKE2B 367959e934fdf8e447da9632a05ea0ada6116a7c39cf42096a3b24f0dcf0c0bfbd3263e6f3913611c27e76f629b77d1e5022fa124d7e79f03a224bd3627bb538 SHA512 b59bedcac4e07ddbb62e90df57670116ba51c3d8c6294679ba5d8f17d7adbf3644f3d203c1d1ef4fa06d7e50640148ee259a081afb807477784350b98c52da11 diff --git a/sci-visualization/tensorboard/tensorboard-1.15.0.ebuild b/sci-visualization/tensorboard/tensorboard-1.15.0.ebuild index 10bba99a3648..4bf4063d7d7c 100644 --- a/sci-visualization/tensorboard/tensorboard-1.15.0.ebuild +++ b/sci-visualization/tensorboard/tensorboard-1.15.0.ebuild @@ -27,8 +27,7 @@ RDEPEND=" dev-python/six[${PYTHON_USEDEP}] >=dev-python/setuptools-41[${PYTHON_USEDEP}] dev-python/werkzeug[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}]" + dev-python/wheel[${PYTHON_USEDEP}]" BDEPEND="app-arch/unzip ${PYTHON_DEPS}" PDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]" diff --git a/sci-visualization/tensorboard/tensorboard-2.0.0.ebuild b/sci-visualization/tensorboard/tensorboard-2.0.0.ebuild index 10bba99a3648..4bf4063d7d7c 100644 --- a/sci-visualization/tensorboard/tensorboard-2.0.0.ebuild +++ b/sci-visualization/tensorboard/tensorboard-2.0.0.ebuild @@ -27,8 +27,7 @@ RDEPEND=" dev-python/six[${PYTHON_USEDEP}] >=dev-python/setuptools-41[${PYTHON_USEDEP}] dev-python/werkzeug[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}]" + dev-python/wheel[${PYTHON_USEDEP}]" BDEPEND="app-arch/unzip ${PYTHON_DEPS}" PDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]" diff --git a/sci-visualization/tensorboard/tensorboard-2.1.0-r1.ebuild b/sci-visualization/tensorboard/tensorboard-2.1.0-r1.ebuild index 385c77db9a5a..4b8819557ebe 100644 --- a/sci-visualization/tensorboard/tensorboard-2.1.0-r1.ebuild +++ b/sci-visualization/tensorboard/tensorboard-2.1.0-r1.ebuild @@ -30,8 +30,7 @@ RDEPEND=" >=dev-python/setuptools-41[${PYTHON_USEDEP}] dev-python/werkzeug[${PYTHON_USEDEP}] dev-python/wheel[${PYTHON_USEDEP}] - >=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}]" + >=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]" BDEPEND="app-arch/unzip ${PYTHON_DEPS}" PDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]" diff --git a/sci-visualization/veusz/Manifest b/sci-visualization/veusz/Manifest index 7f4be9711479..bc341f9b3ed3 100644 --- a/sci-visualization/veusz/Manifest +++ b/sci-visualization/veusz/Manifest @@ -1,5 +1,7 @@ AUX veusz.desktop 248 BLAKE2B 02c9b85f9ea12ef0ee9bf8f538788f577ab4314468e94140b80351accece2dcbcf11b39b26468d8c31e3feb9fc8422a1fe5051b00100743f263eba2558861236 SHA512 986479153d6409a639f0daab4c2c11836927fce93feecf0bffefd7643cfa9c3ee2c24d374f2c6eaef475bc4bcfe39095c6b12bd0731c585ad213f0a4672c8047 AUX veusz.xml 346 BLAKE2B c99688c930b3901edcf500c4a99447074a01be6abfd2be714f8c1dccd4318a0270d30f47f92636280f406ba9003540434c52683b0a8f66fb4d672e3436fdb5a1 SHA512 c4f049d4648192d932560a2e73088843ecb0a2beea2e628424488d552684a8e69b84628773a08947741690eb732901bc8ae8c52fa926d1b44bf02b9046cb569e DIST veusz-3.1.tar.gz 2524607 BLAKE2B ca5c5a75e02c9461e1d81dc4d2cc09865ebd4424f072616bf0a231a1f592a5c1c5aad93f713ed9ec1d9e2ad39b877a36c236b615d904295608d7990eaf59d5fb SHA512 9b940d1cc224f4729f788abe1e29352d35e69d2f78bae7f072a783d339198a8171b0f0b0a5f5af82ef0f0693550a42409956a9cc3888aa46d110d777e81941a4 +DIST veusz-3.2.tar.gz 2528125 BLAKE2B 614488779d1c0e5d800f2b1c86b82615676b08af46831abd6c55653471b045f0c9d28a8cb7489cbb2391fd5f21ab2d40aa6bff4fc195426f3b07b91f6d4ee8d7 SHA512 01e1a030246a3d6811493968f2f30084b2c465195af166b7bdc4009de4c488350a4fba300acee1959310b318e8dc519f090bfca528491811ca52640c33d048bc EBUILD veusz-3.1.ebuild 1822 BLAKE2B fe019a1d52f1fb1e72e401d6d726e9240879da68e346066a083a7dbd8d55dfc2612a11ef5fe24705fbb4802013cacae3f1086347023b9ecc302ecf7783f81d3f SHA512 3b5a1399b221afd99da10bcf5282d2b090d785205ab71fc5716c6a9c05236c03814416f4598912dcaf3d0ea2d6685021283c4df2c158b19114e4cdbde957caad +EBUILD veusz-3.2.ebuild 1783 BLAKE2B bb2c35f6983057e7b3987ab439f7c19f0d6da06ed0a7ac31d19a48b80bad8e866871b6513f22893d2d44ee583a22558c809888f2da129bcf24dacab56ca84ec6 SHA512 62b38a77a7b6c50d6d3431916f6005ff4d61655509bf408e8eebdac69283ee344fec19330d550cd6e3a9e69e98e8477110efafa1def0289f61b7a0647fc00d18 MISC metadata.xml 730 BLAKE2B 5bc89773c5d0af7c79cc5cca45ff0d02a806d2437fedd56a9e1af19d9a89adc567e6f05b20c8e516484b0245a2010d16041497232ff7b424661b97429e34f7c0 SHA512 65ab1ea0d0846da6270837ac51c15aeea7eca2f56c9240bdf4d0b227d0d6aa51665ae88efb578b1f55348d0e8fba63ff2f859ba94184216090b2410227017cd5 diff --git a/sci-visualization/veusz/veusz-3.2.ebuild b/sci-visualization/veusz/veusz-3.2.ebuild new file mode 100644 index 000000000000..1be659e776eb --- /dev/null +++ b/sci-visualization/veusz/veusz-3.2.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit desktop distutils-r1 virtualx xdg + +DESCRIPTION="Qt scientific plotting package with good Postscript output" +HOMEPAGE="https://veusz.github.io/" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="dbus doc hdf5 minuit" +RESTRICT="!test? ( test )" + +CDEPEND="dev-python/PyQt5[widgets,svg,printsupport,${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}]" +RDEPEND="${CDEPEND} + dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) + hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] ) + minuit? ( dev-python/iminuit[${PYTHON_USEDEP}] )" +DEPEND="${CDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/sip[${PYTHON_USEDEP}] + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" + +src_prepare() { + distutils-r1_src_prepare + xdg_environment_reset +} + +python_test() { + distutils_install_for_testing + VIRTUALX_COMMAND="${EPYTHON}" \ + VEUSZ_RESOURCE_DIR="${S}" \ + virtx tests/runselftest.py +} + +python_install() { + distutils-r1_python_install + # symlink the license, bug #341653 + rm "${D}/$(python_get_sitedir)"/${PN}/{COPYING,AUTHORS,ChangeLog} || die + mkdir -p "${D}/$(python_get_sitedir)" || die + cat >> "${D}/$(python_get_sitedir)"/${PN}/COPYING <<- EOF + Please visit + + https://www.gnu.org/licenses/gpl-2.0.html + + for the full license text. + EOF +} + +python_install_all() { + distutils-r1_python_install_all + + if use doc; then + dodoc Documents/manual/pdf/${PN}.pdf + docinto html + dodoc -r Documents/manual/html + fi + + doicon icons/veusz.png + domenu "${FILESDIR}"/veusz.desktop + insinto /usr/share/mime/packages + doins "${FILESDIR}"/veusz.xml +} |