gentoo resync : 18.11.2019

7 files changed, 41 insertions, 35 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 510484f2d6f5..91f259ff2d5f 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index becc7892f788..4f510ba9f1e0 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -7,7 +7,7 @@ DIST gnuplot-5.2.6.tar.gz 5321601 BLAKE2B 4281ba29926ee7fc046b48006fed6513dd3a9e
 DIST gnuplot-5.2.7.tar.gz 5335673 BLAKE2B 6ca3055f6bb2e032562c7f21beda0adca1087598c7bacc9ab187c7ea4a3d85e08598ddb0ff0660bca081bc17899dbb92bbfbb6acde8b7b5367f12da7a2a14b62 SHA512 f6b77e16b25e5705ea9dad4f89ed5f5a3cf95d3e4215da00be3cbfbcdeee23009e9205156399448526783f25b5b7599b674670c94c01345abafeff74f6c7de93
 EBUILD gnuplot-5.0.7.ebuild 5796 BLAKE2B 055c13b67f9a8242f986cbc99364ecb9bb8dda241db3de84e97c4b68b92b50c44600933a07a6da0064595828fd5c718640bc7ff7aa62fc85314944a2970d6f00 SHA512 22453ef591dc01114f4caacd0cb1ecb88ba4d5fb2fb95139a6698ee019e385955ab18487e279500be491f1fcd335885cd19b5afe58bb42b107a3516b1bacc2cd
 EBUILD gnuplot-5.2.6.ebuild 5860 BLAKE2B 75e70fe4a0c2dad6e8f2cf3f6faceb064c862824eb02625fbf1182ebc4944c16102b4fb4a855e34f65823cac9dfa47795d7798498a49b9cf62068782a5970dde SHA512 99eea66f0ad9414f1877093c27b25d0ec95ef657991732a53a0b730986c46e688d3351eff7b3176aa16fe0be63cdae5d904341326300a5b1f507a2d4b0e5d16e
-EBUILD gnuplot-5.2.7.ebuild 5866 BLAKE2B cfd9b916c32e0f3c4b449600eb244cc41f18e7fe088d000ed9d7c9b2491efa09d1641e006af9ee2476f8ebee0ac404d306ed196f9249a081fa129415d895e39a SHA512 0c56f62b54db8ec0c00f0d0a8ded3b51849df46a9307a863b273fe65fae71c3be54f42628e1cf1f695c01f30b12018dea74f028e4b319e5394d99634a13ab8b3
+EBUILD gnuplot-5.2.7.ebuild 5862 BLAKE2B e7c4e3647888488af35e2e53c2de71e8c57d1c1a9eaa921fa5ba3b859bda7acdd2ed793ee04e227a55078d655ec46e0b7dc4c53364fa6aefe3313fbc7a3b6e82 SHA512 866995c315b96e3b5849fae5ae6ce81defd3ce8e4c1cc5aa04e965a0e00c86f883bb904ad1a79ca43fcf297e064d26aec1677ed55d537433c05a4168c30bf9f7
 EBUILD gnuplot-5.2.9999.ebuild 5757 BLAKE2B d06057469c991523ea917e44454557fb3e4e9889d212f7dfb939b61ae72f0dddaf2a54139bc180eeaf9d3f70b3cb58a6b602a3cdb620022de07c14520aa67bd5 SHA512 55a8b01b7738e5e5afd765d0b5471f01f3d25a6e48e45c45f8773b241d7394c87f9ac0e535f9eefaadb19af45a3f56ae96586ca35e626b710dd9764179549afe
 EBUILD gnuplot-5.3.9999.ebuild 5179 BLAKE2B ab729324b1774afe1b91922b1d68fc6b5eba7eba6da633c76a80d72ad15880367c82ad35d2f9ddf9933dac8c053ec533575167366cbf66dbac7b60d6c7e5d71f SHA512 6c90878ff3c226e6d9a1de64d4e61523491f51bf95345f280109c8e113ac1375e7b4973bf21b437df5375d0f998ad03f26a9c7a2e385269af2ccf9eba03410fa
 MISC metadata.xml 1267 BLAKE2B f3b0192ce2cd8d0fb10c2f4fb4bad9780f01746cb283c19e7ecc622c85470ed8a3b7193ca2f7abdee6fdb771719e0c0a9a8a5c7fd9320ef0dae1f1210e7e36cd SHA512 dc9f36a7f2ffb85eeafb41a2b5d0b61746ef3e1de049db18ba351108b887b4cf506ea871754918faae8b4989e5ee7dbfc9f7f48c5b9df55a3bbe782425dc0421
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild
index da97fbcf2aaf..24feb924b657 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 bitmap? ( free-noncomm )"
diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest
index 6d4285557d86..6acdfbc0d554 100644
--- a/sci-visualization/labplot/Manifest
+++ b/sci-visualization/labplot/Manifest
@@ -1,4 +1,4 @@
 DIST labplot-2.6.0.tar.xz 12360732 BLAKE2B f6259de30deb0adb4ddd47f0401fe8753a277aa01ade27c220ec832eb7f6c3e568c765085d2567529799777c9fe2442da777bd4089e5f488cc1aefb25a61d5a8 SHA512 6ebc96b3cfb25ebd62a6631d8cca0d9574f84548c04271eb8a10ff3ef9ebbdd0bf842b9b6129a995953412c5e6f902440dc91dbaa01d97fc220d7f6b19dc46af
 EBUILD labplot-2.6.0.ebuild 1978 BLAKE2B 859218fe15061bedf882dbeb981e66fd72bb022e1ed97f37047fac8def0f41a6c1ce7abd2c14af9720c8fbb25c12fab5c5c74284b4556685f336d69063b0c077 SHA512 f9b390e17fbfee58e33691d12ad4bd3833e0ea77382ab6d1421a2c343dc33d1c39632064b333e078b4e44a6e301830bcc39162370832bcbd4b02ed8b76023803
-EBUILD labplot-9999.ebuild 1969 BLAKE2B c4d5e397d8ef72dd9665ee34bdad0e382ee120309ea624046b88864a45cf35bc42e12edd9f2b5b6ecbaf2ce58f5f98ec1ea2001cab6282f643d675708e9503e1 SHA512 0d4707bebf1b76766fe0469ce17782faf2b347f1c76fd3c4c9f05d2c5554fe631b27a228fb5879c5bc5570dd979e0b771e7db1380108c9fd1385d9dc290a1366
+EBUILD labplot-9999.ebuild 2180 BLAKE2B 45009029c4154100ed8282362b51c5357b2f8fe3d33273a2223aaf5519d4ebacc347ea867dacf2ebacdedfd7c93691aa543f2f88045a470cdb038530a1c3fb4d SHA512 19a077019ff6078f9c8c75c749c6102d7b0972c2b6a93dbd95465bc84ba73d4ed686f8b264d98bb9097f496deccd82ddb991bfdd8727dac23ce503612cb66729
 MISC metadata.xml 864 BLAKE2B 08fc970f0e9804d36cc5ccbd2b08ee9dbfac30322e5cf56b0253ac3665bced133c2d28d27c64a47cc1faa0f310e6acf8b3f8b774174cab3a2b78da1cf1f0de79 SHA512 04ad431c7e59b54a713c34f35baf3e16b585e45784a39de7bd2a42deea36f27b96d1ea27d1b7bf052934d8f02d57370663c393219fba39bffe6d4d74e07868d0
diff --git a/sci-visualization/labplot/labplot-9999.ebuild b/sci-visualization/labplot/labplot-9999.ebuild
index ba890ab34c73..69ec65373d7f 100644
--- a/sci-visualization/labplot/labplot-9999.ebuild
+++ b/sci-visualization/labplot/labplot-9999.ebuild
@@ -3,16 +3,21 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks"
 HOMEPAGE="https://labplot.kde.org/ https://kde.org/applications/education/org.kde.labplot2"
-[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-2"
-KEYWORDS=""
+SLOT="5"
 IUSE="cantor fftw fits hdf5 libcerf netcdf root"
 
 # not packaged: dev-qt/qtmqtt, bug 683994
@@ -21,33 +26,33 @@ BDEPEND="
 	sys-devel/gettext
 "
 DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtserialport)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtserialport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
 	>=sci-libs/gsl-1.15:=
 	cantor? (
-		$(add_frameworks_dep kparts)
-		$(add_frameworks_dep kservice)
-		$(add_kdeapps_dep cantor)
+		>=kde-frameworks/kparts-${KFMIN}:5
+		>=kde-frameworks/kservice-${KFMIN}:5
+		>=kde-apps/cantor-19.08.0:5
 	)
 	fftw? ( sci-libs/fftw:3.0= )
 	fits? ( sci-libs/cfitsio:= )
@@ -74,5 +79,5 @@ src_configure() {
 		-DENABLE_MQTT=OFF
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/sci-visualization/veusz/Manifest b/sci-visualization/veusz/Manifest
index 499ca5547da1..2c28a1e60a4c 100644
--- a/sci-visualization/veusz/Manifest
+++ b/sci-visualization/veusz/Manifest
@@ -6,5 +6,5 @@ DIST veusz-3.0.tar.gz 2550683 BLAKE2B 72f0da8d9b993d8a3252fbb93314a53832fbf31928
 DIST veusz-3.1.tar.gz 2524607 BLAKE2B ca5c5a75e02c9461e1d81dc4d2cc09865ebd4424f072616bf0a231a1f592a5c1c5aad93f713ed9ec1d9e2ad39b877a36c236b615d904295608d7990eaf59d5fb SHA512 9b940d1cc224f4729f788abe1e29352d35e69d2f78bae7f072a783d339198a8171b0f0b0a5f5af82ef0f0693550a42409956a9cc3888aa46d110d777e81941a4
 EBUILD veusz-3.0.1.ebuild 2143 BLAKE2B f67bb1af08c1e20bbc01b590260e6becc9bfef8dc1cc7af7e0beb7960dcb13145bc7be0672aa3f437d58fc15f42625978039f1707be46aa0e9d57a111ee2fb64 SHA512 0c5a1e9db5601756005976b43aa130f7cc48290b281dae4da33728135ebd18bc96fa99310530586b5194b44b7669d49722ba6b8460a9d6c3a5f0d1a22e3e43a7
 EBUILD veusz-3.0.ebuild 2101 BLAKE2B 9b03d5b117d72aa0b6ef23cbda5fa86029aee2e1fd8d48e468c6fe406aaca89d0442ab853476375473ea690e441216bb41fde9e8d8bfe1a11d993b7e4f6e3fc2 SHA512 d810b47232d50a1bb5a6c60b0a4e6abd4022cedc2e4106823f6f8edd81280cee66d5e54227992ac350b25bbf443be90d27f2c3e842140b520c29a245d46c6451
-EBUILD veusz-3.1.ebuild 1926 BLAKE2B 4dd70714a31616b74f80ec32da19177381c947df329e9cc145c8dd7732be8ceefbba29e35952957855df8f50ca1c1e29708d84fbb282fe03314dc7d1d8081ffb SHA512 2f0e35a85c20d8ed47a5c117e6baa80e68d55df0661d99e09e757281151836de29a77c13aab722f2341d003303ee53b7bab4ba04bea2260c764ba36c8ba66439
+EBUILD veusz-3.1.ebuild 1953 BLAKE2B 3050bbd3b472b60b2953174767ad86dd6b7d39f1a33bbe770aef83bcb82f252e38e3184fc4928aeb1886a24ca28bd2b6e459ed63847d7ecffc7c84eb5bfa6c11 SHA512 5b1755691c5b4515b8d514038ef9f422d1d7089c046de1fb6323dc5c319e0fcb76a3fd6a10c639f7be9df764e3317df50da2683b11b10a696a4b55b837b1b967
 MISC metadata.xml 885 BLAKE2B 90529e34d78f5225e62c2675e15fef6e0fa1898eca31df061f5438460be53f5bad3d1395d5dcb6e300f861c2c52689bca26fcf012ffbbdaf9cf579b9b252a697 SHA512 2e6838e7cc1a152af665c771950f5b53f942ceedb40b118511c2c9b9801a4a170dbc557e3fa389986b0edf2b12b4f008fbbab9c258c59a1b4acd2063c3ef79ac
diff --git a/sci-visualization/veusz/veusz-3.1.ebuild b/sci-visualization/veusz/veusz-3.1.ebuild
index 4eddb89c7f69..bd12cb2bd735 100644
--- a/sci-visualization/veusz/veusz-3.1.ebuild
+++ b/sci-visualization/veusz/veusz-3.1.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="dbus doc emf fits hdf5 minuit"
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-python/PyQt5[widgets,svg,printsupport,${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]"