commit: 73003a1280021d235c196605b0d6380151cc1bce Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Sep 3 17:44:11 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Sep 3 18:03:31 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73003a12
sci-visualization/labplot: 2.5.0 version bump Closes: https://bugs.gentoo.org/665176 Package-Manager: Portage-2.3.48, Repoman-2.3.10 sci-visualization/labplot/Manifest | 1 + .../{labplot-9999.ebuild => labplot-2.5.0.ebuild} | 29 +++++----------------- sci-visualization/labplot/labplot-9999.ebuild | 12 +-------- 3 files changed, 8 insertions(+), 34 deletions(-) diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest index eb9705e4b00..146e34d4dfa 100644 --- a/sci-visualization/labplot/Manifest +++ b/sci-visualization/labplot/Manifest @@ -1 +1,2 @@ DIST labplot-2.4.0-kf5.tar.xz 6038072 BLAKE2B b1116a516f3d94d331584f22aefe4e9e54c0c96e98c08a90929bea1aaf379f04437d39a8644afc7cc7feda3f43881ba552d310ca263ae3fc6db24dbc8fb57777 SHA512 5d29dd7d63d484359e73c8d82d8dbc25a069e1f33829cf75c2a2009ebae2027353ecf578b51806b5f35ae17ec472f5cbfdb4caed2637dc1ecc9229d33033d21b +DIST labplot-2.5.0.tar.xz 11831656 BLAKE2B b6c122509874f1f7a554814b7ac9889b416d36f750ff831773aed313f9eff23abc0809f40f6f591051b287bd1a875af455f5d500ce54130c4d8ddfe5fcfa0870 SHA512 a4b285917e30b0ac00cb8c8ad6827ba3884d95fccc0511a0a317bb2d637e48e6579929c45cfb8bba737bb5a01472a2baa9d812a688730ac4fa40b23cc6625eba diff --git a/sci-visualization/labplot/labplot-9999.ebuild b/sci-visualization/labplot/labplot-2.5.0.ebuild similarity index 76% copy from sci-visualization/labplot/labplot-9999.ebuild copy to sci-visualization/labplot/labplot-2.5.0.ebuild index 25cd79c868c..40f32162ebc 100644 --- a/sci-visualization/labplot/labplot-9999.ebuild +++ b/sci-visualization/labplot/labplot-2.5.0.ebuild @@ -9,13 +9,11 @@ inherit kde5 DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks" HOMEPAGE="https://www.kde.org/applications/education/labplot/"; -[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}-kf5.tar.xz" +[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" LICENSE="GPL-2" KEYWORDS="" -IUSE="cantor fftw fits hdf5 libcerf netcdf root" - -[[ ${KDE_BUILD_TYPE} != live ]] && S="${WORKDIR}/${P}-kf5" +IUSE="cantor fftw fits hdf5 libcerf netcdf" COMMON_DEPEND=" $(add_frameworks_dep karchive) @@ -23,8 +21,10 @@ COMMON_DEPEND=" $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdelibs4support) $(add_frameworks_dep ki18n) $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) $(add_frameworks_dep knewstuff) $(add_frameworks_dep ktextwidgets) $(add_frameworks_dep kwidgetsaddons) @@ -37,20 +37,12 @@ COMMON_DEPEND=" $(add_qt_dep qtsvg) $(add_qt_dep qtwidgets) >=sci-libs/gsl-1.15:= - cantor? ( - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_kdeapps_dep cantor) - ) + cantor? ( $(add_kdeapps_dep cantor) ) 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 - ) " DEPEND="${COMMON_DEPEND} sys-devel/bison @@ -61,14 +53,6 @@ RDEPEND="${COMMON_DEPEND} !sci-visualization/labplot:4 " -src_prepare() { - kde5_src_prepare - - if ! use handbook && [[ ${KDE_BUILD_TYPE} != live ]]; then - cmake_comment_add_subdirectory doc-translations - fi -} - src_configure() { local mycmakeargs=( -DENABLE_CANTOR=$(usex cantor) @@ -77,8 +61,7 @@ src_configure() { -DENABLE_HDF5=$(usex hdf5) -DENABLE_LIBCERF=$(usex libcerf) -DENABLE_NETCDF=$(usex netcdf) - -DENABLE_ROOT=$(usex root) - -DENABLE_TEST=$(usex test) + -DENABLE_TESTS=$(usex test) ) kde5_src_configure diff --git a/sci-visualization/labplot/labplot-9999.ebuild b/sci-visualization/labplot/labplot-9999.ebuild index 25cd79c868c..b6d50918c31 100644 --- a/sci-visualization/labplot/labplot-9999.ebuild +++ b/sci-visualization/labplot/labplot-9999.ebuild @@ -9,14 +9,12 @@ inherit kde5 DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks" HOMEPAGE="https://www.kde.org/applications/education/labplot/"; -[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}-kf5.tar.xz" +[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" LICENSE="GPL-2" KEYWORDS="" IUSE="cantor fftw fits hdf5 libcerf netcdf root" -[[ ${KDE_BUILD_TYPE} != live ]] && S="${WORKDIR}/${P}-kf5" - COMMON_DEPEND=" $(add_frameworks_dep karchive) $(add_frameworks_dep kcompletion) @@ -61,14 +59,6 @@ RDEPEND="${COMMON_DEPEND} !sci-visualization/labplot:4 " -src_prepare() { - kde5_src_prepare - - if ! use handbook && [[ ${KDE_BUILD_TYPE} != live ]]; then - cmake_comment_add_subdirectory doc-translations - fi -} - src_configure() { local mycmakeargs=( -DENABLE_CANTOR=$(usex cantor)
