gentoo resync : 15.12.2019

3 files changed, 87 insertions, 2 deletions

diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest
index 6acdfbc0d554..5474d6272058 100644
--- a/sci-visualization/labplot/Manifest
+++ b/sci-visualization/labplot/Manifest
@@ -1,4 +1,6 @@
 DIST labplot-2.6.0.tar.xz 12360732 BLAKE2B f6259de30deb0adb4ddd47f0401fe8753a277aa01ade27c220ec832eb7f6c3e568c765085d2567529799777c9fe2442da777bd4089e5f488cc1aefb25a61d5a8 SHA512 6ebc96b3cfb25ebd62a6631d8cca0d9574f84548c04271eb8a10ff3ef9ebbdd0bf842b9b6129a995953412c5e6f902440dc91dbaa01d97fc220d7f6b19dc46af
+DIST labplot-2.7.0.tar.xz 13306532 BLAKE2B 044f6f1e552b6ccbd56791e39af240c97f0c572fae66ede0bbc13e172a88b652b0c42182fa4f6742b386dfd9c17f3041180841fe531387a9f44bd9b00adb8c09 SHA512 73e10ed98694b7633e80ffa7745733392cf9ce36f45e4ef6432d661b015dd3e821ddc791223a32fa55115c68f0d82b90464080915f8bb55cd1907610151a2d0a
 EBUILD labplot-2.6.0.ebuild 1978 BLAKE2B 859218fe15061bedf882dbeb981e66fd72bb022e1ed97f37047fac8def0f41a6c1ce7abd2c14af9720c8fbb25c12fab5c5c74284b4556685f336d69063b0c077 SHA512 f9b390e17fbfee58e33691d12ad4bd3833e0ea77382ab6d1421a2c343dc33d1c39632064b333e078b4e44a6e301830bcc39162370832bcbd4b02ed8b76023803
-EBUILD labplot-9999.ebuild 2180 BLAKE2B 45009029c4154100ed8282362b51c5357b2f8fe3d33273a2223aaf5519d4ebacc347ea867dacf2ebacdedfd7c93691aa543f2f88045a470cdb038530a1c3fb4d SHA512 19a077019ff6078f9c8c75c749c6102d7b0972c2b6a93dbd95465bc84ba73d4ed686f8b264d98bb9097f496deccd82ddb991bfdd8727dac23ce503612cb66729
+EBUILD labplot-2.7.0.ebuild 2180 BLAKE2B bdfc006342f37984afb3ee2518b40f039db75ed17235cf1daecb358527f36496d43eee2f3e4bc979ad50201fd154205ea02c05f9d26dc0a9e4d54847ee9d08c5 SHA512 b040383dda9e4f1b62a36b045a18724083bc4c0fdaa9398132e06253e3786e363fbbfe3d33d88f103a562364e0709b9bebaa3e761c45e39ba400c84e59c110d6
+EBUILD labplot-9999.ebuild 2180 BLAKE2B bdfc006342f37984afb3ee2518b40f039db75ed17235cf1daecb358527f36496d43eee2f3e4bc979ad50201fd154205ea02c05f9d26dc0a9e4d54847ee9d08c5 SHA512 b040383dda9e4f1b62a36b045a18724083bc4c0fdaa9398132e06253e3786e363fbbfe3d33d88f103a562364e0709b9bebaa3e761c45e39ba400c84e59c110d6
 MISC metadata.xml 864 BLAKE2B 08fc970f0e9804d36cc5ccbd2b08ee9dbfac30322e5cf56b0253ac3665bced133c2d28d27c64a47cc1faa0f310e6acf8b3f8b774174cab3a2b78da1cf1f0de79 SHA512 04ad431c7e59b54a713c34f35baf3e16b585e45784a39de7bd2a42deea36f27b96d1ea27d1b7bf052934d8f02d57370663c393219fba39bffe6d4d74e07868d0
diff --git a/sci-visualization/labplot/labplot-2.7.0.ebuild b/sci-visualization/labplot/labplot-2.7.0.ebuild
new file mode 100644
index 000000000000..fcf591f4a89e
--- /dev/null
+++ b/sci-visualization/labplot/labplot-2.7.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="cantor fftw fits hdf5 libcerf netcdf root"
+
+# not packaged: dev-qt/qtmqtt, bug 683994
+BDEPEND="
+	sys-devel/bison
+	sys-devel/gettext
+"
+DEPEND="
+	>=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? (
+		>=kde-apps/cantor-19.08.0:5
+		>=kde-frameworks/kparts-${KFMIN}:5
+		>=kde-frameworks/kservice-${KFMIN}:5
+	)
+	fftw? ( sci-libs/fftw:3.0= )
+	fits? ( sci-libs/cfitsio:= )
+	hdf5? ( sci-libs/hdf5:= )
+	libcerf? ( sci-libs/libcerf )
+	netcdf? ( sci-libs/netcdf:= )
+	root? (
+		app-arch/lz4
+		sys-libs/zlib
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CANTOR=$(usex cantor)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_FITS=$(usex fits)
+		-DENABLE_HDF5=$(usex hdf5)
+		-DENABLE_LIBCERF=$(usex libcerf)
+		-DENABLE_NETCDF=$(usex netcdf)
+		-DENABLE_ROOT=$(usex root)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_MQTT=OFF
+	)
+
+	ecm_src_configure
+}
diff --git a/sci-visualization/labplot/labplot-9999.ebuild b/sci-visualization/labplot/labplot-9999.ebuild
index 69ec65373d7f..fcf591f4a89e 100644
--- a/sci-visualization/labplot/labplot-9999.ebuild
+++ b/sci-visualization/labplot/labplot-9999.ebuild
@@ -50,9 +50,9 @@ DEPEND="
 	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
 	>=sci-libs/gsl-1.15:=
 	cantor? (
+		>=kde-apps/cantor-19.08.0:5
 		>=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:= )