summaryrefslogtreecommitdiff
path: root/sci-visualization
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-02-10 21:05:55 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-02-10 21:05:55 +0000
commit71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree9f1f0dee23e13658e52f49437befe78427148c51 /sci-visualization
parent29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)
gentoo resync : 10.02.2020
Diffstat (limited to 'sci-visualization')
-rw-r--r--sci-visualization/Manifest.gzbin5350 -> 5364 bytes
-rw-r--r--sci-visualization/paraview/Manifest2
-rw-r--r--sci-visualization/paraview/paraview-5.6.1-r1.ebuild (renamed from sci-visualization/paraview/paraview-5.6.1.ebuild)35
-rw-r--r--sci-visualization/pythonprop/Manifest4
-rw-r--r--sci-visualization/pythonprop/pythonprop-0.13.ebuild12
-rw-r--r--sci-visualization/pythonprop/pythonprop-0.18-r2.ebuild (renamed from sci-visualization/pythonprop/pythonprop-0.18-r1.ebuild)12
-rw-r--r--sci-visualization/pyxplot/Manifest2
-rw-r--r--sci-visualization/pyxplot/pyxplot-0.9.2-r3.ebuild (renamed from sci-visualization/pyxplot/pyxplot-0.9.2-r2.ebuild)10
-rw-r--r--sci-visualization/veusz/Manifest9
-rw-r--r--sci-visualization/veusz/files/fix_spline.patch16
-rw-r--r--sci-visualization/veusz/metadata.xml1
-rw-r--r--sci-visualization/veusz/veusz-3.0.1.ebuild80
-rw-r--r--sci-visualization/veusz/veusz-3.0.ebuild78
-rw-r--r--sci-visualization/veusz/veusz-3.1.ebuild3
14 files changed, 47 insertions, 217 deletions
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index ea06602455a3..13b80cafad4b 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
Binary files differ
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 5a34f4c8b61f..3321cead4c10 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -3,5 +3,5 @@ AUX paraview-5.3.0-fix_buildsystem.patch 797 BLAKE2B f77c72f34c13eae42a4da281f95
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.ebuild 8580 BLAKE2B 6cccc2df91270d5275ef01b76f68e824dd363192cafaa1f7661fc03939f10794de957312fef49b1a6e1906a912ad0786d600227c67146f084c961881a1d9c650 SHA512 e535c09777bea126d8efe65f8add9ad4ad68331f58c3cf00df38b20ff37f07c28b5255669c2f33207497caa8b95a5a5383b3c6c2194b8392f24f8b79ce9d3702
+EBUILD paraview-5.6.1-r1.ebuild 8689 BLAKE2B fb1153248908e538e9b94fa5970f77d98356ec9f3295b69f47f1f3377166ea955eeac39951d1d369e0159bed618bcd42b1386bbc2dd43ba09c83ea88aeb55a6a SHA512 212bf2665707e2d623305fe9ac01bb7095208443b404a8c1f64e3500d9c64504b7ab06424c9cd7aeaf476c8b3eaead90f458537c5c1235701faa0f639832df32
MISC metadata.xml 817 BLAKE2B 8a28d48b1c9f543a90ca28f59c1f943ab0943c25457749a3f8b9a638b63a6703b8ec339ce35abe1fcca74963fbbddac96742094e036431d57d8763c494e4ac04 SHA512 fcc3c91bde9894d1d49b7845c2aca2b3d7ceba09b503b57405ba870a1a414fe7b280313844a2932d80d8d96987b035d948ce219032710e347181db8e3c9738ca
diff --git a/sci-visualization/paraview/paraview-5.6.1.ebuild b/sci-visualization/paraview/paraview-5.6.1-r1.ebuild
index 52e09353c23c..6233e8195c65 100644
--- a/sci-visualization/paraview/paraview-5.6.1.ebuild
+++ b/sci-visualization/paraview/paraview-5.6.1-r1.ebuild
@@ -62,19 +62,21 @@ RDEPEND="
!offscreen? ( virtual/opengl )
python? (
${PYTHON_DEPS}
- dev-python/constantly[${PYTHON_USEDEP}]
- dev-python/incremental[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- || ( dev-python/twisted[${PYTHON_USEDEP}]
- dev-python/twisted-core[${PYTHON_USEDEP}]
- )
- dev-python/zope-interface[${PYTHON_USEDEP}]
- mpi? ( dev-python/mpi4py )
- qt5? ( dev-python/PyQt5[opengl,webkit,${PYTHON_USEDEP}] )
+ $(python_gen_cond_dep '
+ dev-python/constantly[${PYTHON_MULTI_USEDEP}]
+ dev-python/incremental[${PYTHON_MULTI_USEDEP}]
+ dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ 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/zope-interface[${PYTHON_MULTI_USEDEP}]
+ mpi? ( dev-python/mpi4py )
+ qt5? ( dev-python/PyQt5[opengl,webkit,${PYTHON_MULTI_USEDEP}] )
+ ')
)
qt5? (
dev-qt/designer:5
@@ -91,7 +93,11 @@ RDEPEND="
tk? ( dev-lang/tk:0= )"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
- boost? ( dev-libs/boost[mpi?,${PYTHON_USEDEP}] )
+ boost? (
+ $(python_gen_cond_dep '
+ dev-libs/boost[mpi?,${PYTHON_MULTI_USEDEP}]
+ ')
+ )
doc? ( app-doc/doxygen )"
S="${WORKDIR}/${MY_P}"
@@ -134,7 +140,6 @@ src_configure() {
local mycmakeargs=(
-DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include
-DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so
-DBUILD_SHARED_LIBS=ON
diff --git a/sci-visualization/pythonprop/Manifest b/sci-visualization/pythonprop/Manifest
index d7ed0472e07e..d37b02f534bb 100644
--- a/sci-visualization/pythonprop/Manifest
+++ b/sci-visualization/pythonprop/Manifest
@@ -1,5 +1,5 @@
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 655 BLAKE2B 2415c43259f6dceedb093ff8c271c22a816be418533f166ccd3c8ca8526e2f53de3ca43b69c3134f5b8d8d166a561a1908aff8fc14f317aad86609efe7a09e7c SHA512 762df784334b9ad3e951acfa03406dad59bdc45c76660b1fad48b9ec1411d44153360bb606c1dc567d4fc0b5edbbe419c968dffc627f673701f46da249bd405b
-EBUILD pythonprop-0.18-r1.ebuild 932 BLAKE2B 1c8cbe807ba78d320dc43527d57da73f2940e542e7f899fdbc99abdc56d66f38bc3f16b4d1a1d60ada0f767ff752ac7b83199035da3237fa79a3cdf96da42f8d SHA512 762937dcec7b236e254a569f9de2733c464c645cf33a7c295a9c70037bc8073f7524e76dabda4a53606961faa91d1684e0a2c4bfd8a7f1cd8d7aca84c06d217a
+EBUILD pythonprop-0.13.ebuild 707 BLAKE2B 346d26ab57dc035cd0cd0702f30e8a201b69b329782707128a5a52639c13fda0cc9947fee9b6cde5ab479ef4454c576255f3f82cf56531d54360937f2f279d10 SHA512 4e566488966c2373bab3c039e0b12ee87f7e75b756032143fb73c752bd88c46750197fec85bc39f8c3619c0afb7521bf6f2f280fe2df98f3e814b292574a1790
+EBUILD pythonprop-0.18-r2.ebuild 984 BLAKE2B f9e9ed2187e5925fdea3736ce3c52c34c38129bbc3e4bd8a43e56f5fdc1bcce4e3b5082f32593aaa2541d4b3cf269a63928f0964788a999f7b8ebcd911f5f1ac SHA512 04de410ce6566ed674af8ddd97500b19ae0220f133a403beeb30aaba2fb74a6ae5a82bdfbf9c6c8b6e48bf317fe4a4fca5653eaea3a25d8ff464c9e37b779466
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
index 854920aa56a8..729017cea4fc 100644
--- a/sci-visualization/pythonprop/pythonprop-0.13.ebuild
+++ b/sci-visualization/pythonprop/pythonprop-0.13.ebuild
@@ -19,11 +19,13 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
${PYTHON_DEPS}
- || (
- dev-python/matplotlib-python2[gtk2,${PYTHON_USEDEP}]
- dev-python/matplotlib[gtk2,${PYTHON_USEDEP}]
- )
- dev-python/basemap[${PYTHON_USEDEP}]
+ $(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-r1.ebuild b/sci-visualization/pythonprop/pythonprop-0.18-r2.ebuild
index a5c36e5b53b4..4f8e8ef1e524 100644
--- a/sci-visualization/pythonprop/pythonprop-0.18-r1.ebuild
+++ b/sci-visualization/pythonprop/pythonprop-0.18-r2.ebuild
@@ -19,11 +19,13 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
${PYTHON_DEPS}
- || (
- dev-python/matplotlib-python2[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- )
- dev-python/basemap[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ || (
+ dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}]
+ dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+ )
+ ')
+ dev-python/basemap[${PYTHON_SINGLE_USEDEP}]
sci-electronics/voacapl
"
DEPEND="${RDEPEND}
diff --git a/sci-visualization/pyxplot/Manifest b/sci-visualization/pyxplot/Manifest
index c81bb400fd09..355d0ed1c1ee 100644
--- a/sci-visualization/pyxplot/Manifest
+++ b/sci-visualization/pyxplot/Manifest
@@ -1,3 +1,3 @@
DIST pyxplot_0.9.2.tar.gz 4131841 BLAKE2B 8a5da46f2328ae8e73d7b841dc04b8d972bdaeb7dacaf658349e5235a696334cd806b8f8bc25b9bbebe2074f52f4fb0bad4b22ff305250b1a4d138ea039657e5 SHA512 34c43fec36dd579161c7adb9f0bab012c5d3e59c904526f82a70a31685b88a231c300ab4dbdff376b29fdd5698c376d55f7a2f2786d7960c4de7e6e0776fa844
-EBUILD pyxplot-0.9.2-r2.ebuild 998 BLAKE2B d3378d9a18598654471f885ac1da3f512afc393594fc6f82d48f5962921440a685c2b784c9b76806d0a8e225ebe797f9f96dd2183388e699a4963c27461930c6 SHA512 23ef5ce2e687362f51bd173db7b0f3e810c6470ac8e3efe15410ab79b8a22f1702a678bf1dee18069fd195405d819df389972c3edc8a8487d5540d71c1b6134f
+EBUILD pyxplot-0.9.2-r3.ebuild 1043 BLAKE2B 10fe324798302f00c22eadfa5aa93156e2a1bb90dcffb35168fb5ea8775ba75c7afb9934742957016ea1e691b2c704716d6a0c6d103b32ffe6ddbbb5f968539e SHA512 85733755f8e6a54fb300a3889720c264db84f0f4c4cbce3a86a4454642d56d615d2599a1d874e7520246f9aae6096ee017397a89728e77ad24f5269485111257
MISC metadata.xml 649 BLAKE2B a709482e9a6d3f30231db228633f682ba1426640a5ababffc02b8a625900f62ec1f2bd40a6d2469085d87ed7c342081596d7371b112f0c4b56435f2ca7253f15 SHA512 2f9b6c06f24dccd4c954dc35cd4ac2b286ff77c5cf5794ed8ec6e20af4050c09099c84bdd75402823aed922f879b8d4340d9f6ce8763e116c0ba476853475531
diff --git a/sci-visualization/pyxplot/pyxplot-0.9.2-r2.ebuild b/sci-visualization/pyxplot/pyxplot-0.9.2-r3.ebuild
index 7ecda5c36f0e..7cc957e134be 100644
--- a/sci-visualization/pyxplot/pyxplot-0.9.2-r2.ebuild
+++ b/sci-visualization/pyxplot/pyxplot-0.9.2-r3.ebuild
@@ -24,10 +24,12 @@ RDEPEND="
sci-libs/cfitsio
sci-libs/fftw:3.0=
sci-libs/gsl
- || (
- sci-libs/scipy-python2[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- )
+ $(python_gen_cond_dep '
+ || (
+ sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
+ sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
+ )
+ ')
virtual/latex-base
virtual/imagemagick-tools
${PYTHON_DEPS}"
diff --git a/sci-visualization/veusz/Manifest b/sci-visualization/veusz/Manifest
index c16103746725..7f4be9711479 100644
--- a/sci-visualization/veusz/Manifest
+++ b/sci-visualization/veusz/Manifest
@@ -1,10 +1,5 @@
-AUX fix_spline.patch 758 BLAKE2B a0d3af3bf186a6935a88e985931353085ce043e244fddecb7f9a5e0f71a812d0582218e4b544d320b6a380c9b6d2ff964e69799503cb08ab74451617fe1bc815 SHA512 9e0284b7dd879089dc16b28474060c2c53a8955645096e63e435129c237012b9cebcd666f10da4faa0c99b37512952961fa0f1f3d6c2747f3ab791bd8925c26b
AUX veusz.desktop 248 BLAKE2B 02c9b85f9ea12ef0ee9bf8f538788f577ab4314468e94140b80351accece2dcbcf11b39b26468d8c31e3feb9fc8422a1fe5051b00100743f263eba2558861236 SHA512 986479153d6409a639f0daab4c2c11836927fce93feecf0bffefd7643cfa9c3ee2c24d374f2c6eaef475bc4bcfe39095c6b12bd0731c585ad213f0a4672c8047
AUX veusz.xml 346 BLAKE2B c99688c930b3901edcf500c4a99447074a01be6abfd2be714f8c1dccd4318a0270d30f47f92636280f406ba9003540434c52683b0a8f66fb4d672e3436fdb5a1 SHA512 c4f049d4648192d932560a2e73088843ecb0a2beea2e628424488d552684a8e69b84628773a08947741690eb732901bc8ae8c52fa926d1b44bf02b9046cb569e
-DIST veusz-3.0.1.tar.gz 2554401 BLAKE2B 6e5649eef94ce0bd7fcdfa8325b35de144aaecd792f32c149f5a6f16c7c35f10d29bebeb37531d726e1b87f6d46855d7cdb2af402ec8fd0a2c1af91844d12c03 SHA512 99766c0fee70c12bba7b2ee8434224649763323aa9278d2116159f18257e1e1c5a491d591efb779c1bbb9dba1fb524ad8185fa2e91429ba1cc594fd632cb6238
-DIST veusz-3.0.tar.gz 2550683 BLAKE2B 72f0da8d9b993d8a3252fbb93314a53832fbf319287946e9ebc9317ebdab3f10ef2071012b88a1ff3d31d4732f367ded0b217dfa9766f5a09abe90e96b769e45 SHA512 a740d5677e8f23245e54573de0faaa66b659b54e289b256dc344f5aa0cc2a05db26efce57ff31b19c1235e04a9aa22cfa12125a784d27b0e3725277cbfae1b06
DIST veusz-3.1.tar.gz 2524607 BLAKE2B ca5c5a75e02c9461e1d81dc4d2cc09865ebd4424f072616bf0a231a1f592a5c1c5aad93f713ed9ec1d9e2ad39b877a36c236b615d904295608d7990eaf59d5fb SHA512 9b940d1cc224f4729f788abe1e29352d35e69d2f78bae7f072a783d339198a8171b0f0b0a5f5af82ef0f0693550a42409956a9cc3888aa46d110d777e81941a4
-EBUILD veusz-3.0.1.ebuild 2065 BLAKE2B a654c941efa8cf3884186a50a87af89c9e84c6d5af7a63e1faa00a939b5ed94cec55c0600b3ac101293509926284a39a79706dafa8e454ddb35b0abbebf34ca1 SHA512 d00516aa01043f7fd53c5e1484cfdcec5abdf00146868df541ce037207bf05484e3f6a7eda0dd0a034644560f00ec98611b1d1924dbf8fe64b58af202e11ab2d
-EBUILD veusz-3.0.ebuild 2023 BLAKE2B bc3eecfd1825cce2aedb3ab2f927ebdc1f2fd738a9c190f613f2ee2bbf9c98912fa67a386f93537de864337e2904fc7d024b3a413ee5948ef59b465eb6c0cc3b SHA512 98688ec7a23fb389a0a8e94efae9fd2f2bdd9232272171c2445a96b5516eef4993448591e7991c852d0798cdb70be8acb59e4d51527a6f659bf1fb4cd7a4be2b
-EBUILD veusz-3.1.ebuild 1875 BLAKE2B 6894a4ace1b2f67857538d25bdd323ffcb038440982f2f182534e440b10c8e71b2954b8ebebc3ea74e52d0b7727d9bcb88dab032883d8b3f6506beca1d1c7d06 SHA512 ad9a629bc9313910f1322e1cb691395ffaeee7679ae319565ce4dd13c00b918bec311e045592491e8a21844ac179b1b25f0282078c552e4a797067edbf9afae4
-MISC metadata.xml 809 BLAKE2B 62297452456fc54f2da02b83c5a2c2b713c93e9de4edf186063bb9499dfd5724ff69d5e1b328cd65b3f21ab07009d3522fbe7cd98a4e6da7ff25329c4ad84c23 SHA512 16f7a7f127ec6261d672234238545adfbb036d9cf94f5fb031f0ed74cb3b49f2840697199fcf03970692f96a4ee55d12f1452e3179a20644307221ca84e2a556
+EBUILD veusz-3.1.ebuild 1822 BLAKE2B fe019a1d52f1fb1e72e401d6d726e9240879da68e346066a083a7dbd8d55dfc2612a11ef5fe24705fbb4802013cacae3f1086347023b9ecc302ecf7783f81d3f SHA512 3b5a1399b221afd99da10bcf5282d2b090d785205ab71fc5716c6a9c05236c03814416f4598912dcaf3d0ea2d6685021283c4df2c158b19114e4cdbde957caad
+MISC metadata.xml 730 BLAKE2B 5bc89773c5d0af7c79cc5cca45ff0d02a806d2437fedd56a9e1af19d9a89adc567e6f05b20c8e516484b0245a2010d16041497232ff7b424661b97429e34f7c0 SHA512 65ab1ea0d0846da6270837ac51c15aeea7eca2f56c9240bdf4d0b227d0d6aa51665ae88efb578b1f55348d0e8fba63ff2f859ba94184216090b2410227017cd5
diff --git a/sci-visualization/veusz/files/fix_spline.patch b/sci-visualization/veusz/files/fix_spline.patch
deleted file mode 100644
index a7d6bd85c48b..000000000000
--- a/sci-visualization/veusz/files/fix_spline.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Upstream patch that fixes spline interpolation:
-# https://github.com/veusz/veusz/commit/b4223800744034880fd1ca1165853636b31e576c
-diff -Naur old/veusz/helpers/src/qtloops/beziers.cpp new/veusz/helpers/src/qtloops/beziers.cpp
---- old/veusz/helpers/src/qtloops/beziers.cpp 2017-09-23 11:10:46.000000000 +0300
-+++ new/veusz/helpers/src/qtloops/beziers.cpp 2018-08-04 21:27:01.000000000 +0300
-@@ -1013,8 +1013,8 @@
- return 0;
- }
-
-- // factor of 0.1 introduced by JSS to stop more hooks
-- double const allowed = L2(b - a)*0.1 + tolerance;
-+ // factor of 0.2 introduced by JSS to stop more hooks
-+ double const allowed = L2(b - a)*0.2 + tolerance;
- return dist / allowed;
- /** \todo
- * effic: Hooks are very rare. We could start by comparing
diff --git a/sci-visualization/veusz/metadata.xml b/sci-visualization/veusz/metadata.xml
index 1eea5012ca20..8ac6168821f3 100644
--- a/sci-visualization/veusz/metadata.xml
+++ b/sci-visualization/veusz/metadata.xml
@@ -12,7 +12,6 @@
facilities.
</longdescription>
<use>
- <flag name="fits">Add FITS format via <pkg>dev-python/astropy</pkg></flag>
<flag name="minuit">Use Minuit during fitting via<pkg>dev-python/pyminuit</pkg></flag>
</use>
<upstream>
diff --git a/sci-visualization/veusz/veusz-3.0.1.ebuild b/sci-visualization/veusz/veusz-3.0.1.ebuild
deleted file mode 100644
index 0bbf8212cca0..000000000000
--- a/sci-visualization/veusz/veusz-3.0.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils distutils-r1 virtualx xdg-utils gnome2-utils
-
-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 fits hdf5 minuit"
-
-CDEPEND="dev-python/PyQt5[widgets,svg,printsupport,${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
- dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
- fits? ( dev-python/astropy[${PYTHON_USEDEP}] )
- hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
- minuit? ( || ( dev-python/iminuit[${PYTHON_USEDEP}] dev-python/pyminuit[${PYTHON_USEDEP}] ) )"
-DEPEND="${CDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=("${FILESDIR}/fix_spline.patch")
-
-python_test() {
- distutils_install_for_testing
- cd tests || die
- VIRTUALX_COMMAND="${EPYTHON}" \
- VEUSZ_RESOURCE_DIR="${S}" \
- virtualmake 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
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
diff --git a/sci-visualization/veusz/veusz-3.0.ebuild b/sci-visualization/veusz/veusz-3.0.ebuild
deleted file mode 100644
index 04fe7a60f538..000000000000
--- a/sci-visualization/veusz/veusz-3.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils distutils-r1 virtualx xdg-utils gnome2-utils
-
-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 fits hdf5 minuit"
-
-CDEPEND="dev-python/PyQt5[widgets,svg,printsupport,${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
- dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
- fits? ( dev-python/astropy[${PYTHON_USEDEP}] )
- hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
- minuit? ( || ( dev-python/iminuit[${PYTHON_USEDEP}] dev-python/pyminuit[${PYTHON_USEDEP}] ) )"
-DEPEND="${CDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_test() {
- distutils_install_for_testing
- cd tests || die
- VIRTUALX_COMMAND="${EPYTHON}" \
- VEUSZ_RESOURCE_DIR="${S}" \
- virtualmake 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
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
diff --git a/sci-visualization/veusz/veusz-3.1.ebuild b/sci-visualization/veusz/veusz-3.1.ebuild
index 57838ea691f1..112eefc77ad4 100644
--- a/sci-visualization/veusz/veusz-3.1.ebuild
+++ b/sci-visualization/veusz/veusz-3.1.ebuild
@@ -14,14 +14,13 @@ 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 fits hdf5 minuit"
+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}] )
- fits? ( dev-python/astropy[${PYTHON_USEDEP}] )
hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
minuit? ( || ( dev-python/iminuit[${PYTHON_USEDEP}] dev-python/pyminuit[${PYTHON_USEDEP}] ) )"
DEPEND="${CDEPEND}