[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/

[Andreas Sturmlechner]

commit:     1ea6b27ef3cf489d099d3753b5c8c2050d67054e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  8 17:55:40 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr  8 17:59:37 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ea6b27e

sci-visualization/labplot: 2.4.0 version bump

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-visualization/labplot/Manifest                               | 1 +
 .../labplot/{labplot-9999.ebuild => labplot-2.4.0.ebuild}        | 9 +++++----
 sci-visualization/labplot/labplot-9999.ebuild                    | 6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/sci-visualization/labplot/Manifest 
b/sci-visualization/labplot/Manifest
index 689f27edbda..a2b212d933c 100644
--- a/sci-visualization/labplot/Manifest
+++ b/sci-visualization/labplot/Manifest
@@ -1 +1,2 @@
 DIST labplot-2.3.0-kf5.tar.xz 4531156 SHA256 
a5a7d706de5f978430b359ada42f9227a2619f5fa9608d56af16c760b7626f33 SHA512 
0f8053bfccbfb6756db14c2d35f69b18bc83395c15cc01cbe61e5877065ad587e1563e7f161dfbac7c75b8b30aa04ee112e0c1962b52544e33ca936bd17b1444
 WHIRLPOOL 
febd50c0a36612a1f93d8190eb9907ede4c29513652cc1a99cfc196c464eb7a7d6bc8692e13a98a9ce31e963a15396385dd9d7b015fe65bd995e2b85e9a09f94
+DIST labplot-2.4.0-kf5.tar.xz 6038072 SHA256 
86198247ff0d274c85607cdb07a0c4ef19149e4f4bf6c9d2e6e8249134e26bb2 SHA512 
5d29dd7d63d484359e73c8d82d8dbc25a069e1f33829cf75c2a2009ebae2027353ecf578b51806b5f35ae17ec472f5cbfdb4caed2637dc1ecc9229d33033d21b
 WHIRLPOOL 
8d5af85ae52bbe1526d00888c1a18922a0f27c3dbf4ff992736e6672008ca61f54f8df93a1c0185bf4fcdcebe4543e58aa7260eafaf40ba8abf87b39ab84bad4

diff --git a/sci-visualization/labplot/labplot-9999.ebuild 
b/sci-visualization/labplot/labplot-2.4.0.ebuild
similarity index 94%
copy from sci-visualization/labplot/labplot-9999.ebuild
copy to sci-visualization/labplot/labplot-2.4.0.ebuild
index 463b7dba15e..41c5faefd1e 100644
--- a/sci-visualization/labplot/labplot-9999.ebuild
+++ b/sci-visualization/labplot/labplot-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.kde.org/applications/education/labplot/";
 [[ ${KDE_BUILD_TYPE} != live ]] && 
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}-kf5.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="cantor fftw fits hdf5 netcdf"
 
 [[ ${KDE_BUILD_TYPE} != live ]] && S="${WORKDIR}/${P}-kf5"
@@ -27,7 +27,6 @@ COMMON_DEPEND="
        $(add_frameworks_dep ki18n)
        $(add_frameworks_dep kiconthemes)
        $(add_frameworks_dep kio)
-       $(add_frameworks_dep knewstuff)
        $(add_frameworks_dep ktextwidgets)
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kxmlgui)
@@ -52,11 +51,13 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 src_prepare() {
+       kde5_src_prepare
+
        if ! use handbook && [[ ${KDE_BUILD_TYPE} != live ]]; then
                cmake_comment_add_subdirectory doc-translations
        fi
 
-       kde5_src_prepare
+       punt_bogus_dep KF5 NewStuff
 }
 
 src_configure() {

diff --git a/sci-visualization/labplot/labplot-9999.ebuild 
b/sci-visualization/labplot/labplot-9999.ebuild
index 463b7dba15e..6eebaf15248 100644
--- a/sci-visualization/labplot/labplot-9999.ebuild
+++ b/sci-visualization/labplot/labplot-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -52,11 +52,11 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 src_prepare() {
+       kde5_src_prepare
+
        if ! use handbook && [[ ${KDE_BUILD_TYPE} != live ]]; then
                cmake_comment_add_subdirectory doc-translations
        fi
-
-       kde5_src_prepare
 }
 
 src_configure() {