Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
Date: Sun, 21 Oct 2018 14:58:23
Message-Id: 1540133852.f23a8655b8870860e897ff3becb0aec7e85d2131.asturm@gentoo
1 commit: f23a8655b8870860e897ff3becb0aec7e85d2131
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 21 14:51:06 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 21 14:57:32 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f23a8655
7
8 sci-visualization/labplot: Add missing dependencies
9
10 Closes: https://bugs.gentoo.org/668882
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12 Package-Manager: Portage-2.3.51, Repoman-2.3.11
13
14 ...labplot-9999.ebuild => labplot-2.5.0-r1.ebuild} | 23 +++++++++-------------
15 sci-visualization/labplot/labplot-9999.ebuild | 4 +++-
16 2 files changed, 12 insertions(+), 15 deletions(-)
17
18 diff --git a/sci-visualization/labplot/labplot-9999.ebuild b/sci-visualization/labplot/labplot-2.5.0-r1.ebuild
19 similarity index 83%
20 copy from sci-visualization/labplot/labplot-9999.ebuild
21 copy to sci-visualization/labplot/labplot-2.5.0-r1.ebuild
22 index b6d50918c31..be9f065e8b5 100644
23 --- a/sci-visualization/labplot/labplot-9999.ebuild
24 +++ b/sci-visualization/labplot/labplot-2.5.0-r1.ebuild
25 @@ -1,4 +1,4 @@
26 -# Copyright 1999-2018 Gentoo Foundation
27 +# Copyright 1999-2018 Gentoo Authors
28 # Distributed under the terms of the GNU General Public License v2
29
30 EAPI=6
31 @@ -12,8 +12,8 @@ HOMEPAGE="https://www.kde.org/applications/education/labplot/"
32 [[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
33
34 LICENSE="GPL-2"
35 -KEYWORDS=""
36 -IUSE="cantor fftw fits hdf5 libcerf netcdf root"
37 +KEYWORDS="~amd64 ~x86"
38 +IUSE="cantor fftw fits hdf5 libcerf netcdf"
39
40 COMMON_DEPEND="
41 $(add_frameworks_dep karchive)
42 @@ -21,8 +21,10 @@ COMMON_DEPEND="
43 $(add_frameworks_dep kconfig)
44 $(add_frameworks_dep kconfigwidgets)
45 $(add_frameworks_dep kcoreaddons)
46 + $(add_frameworks_dep kdelibs4support)
47 $(add_frameworks_dep ki18n)
48 $(add_frameworks_dep kiconthemes)
49 + $(add_frameworks_dep kio)
50 $(add_frameworks_dep knewstuff)
51 $(add_frameworks_dep ktextwidgets)
52 $(add_frameworks_dep kwidgetsaddons)
53 @@ -30,25 +32,19 @@ COMMON_DEPEND="
54 $(add_frameworks_dep syntax-highlighting)
55 $(add_qt_dep qtconcurrent)
56 $(add_qt_dep qtgui)
57 + $(add_qt_dep qtnetwork)
58 $(add_qt_dep qtprintsupport)
59 $(add_qt_dep qtserialport)
60 + $(add_qt_dep qtsql)
61 $(add_qt_dep qtsvg)
62 $(add_qt_dep qtwidgets)
63 >=sci-libs/gsl-1.15:=
64 - cantor? (
65 - $(add_frameworks_dep kparts)
66 - $(add_frameworks_dep kservice)
67 - $(add_kdeapps_dep cantor)
68 - )
69 + cantor? ( $(add_kdeapps_dep cantor) )
70 fftw? ( sci-libs/fftw:3.0= )
71 fits? ( sci-libs/cfitsio:= )
72 hdf5? ( sci-libs/hdf5:= )
73 libcerf? ( sci-libs/libcerf )
74 netcdf? ( sci-libs/netcdf:= )
75 - root? (
76 - app-arch/lz4
77 - sys-libs/zlib
78 - )
79 "
80 DEPEND="${COMMON_DEPEND}
81 sys-devel/bison
82 @@ -67,8 +63,7 @@ src_configure() {
83 -DENABLE_HDF5=$(usex hdf5)
84 -DENABLE_LIBCERF=$(usex libcerf)
85 -DENABLE_NETCDF=$(usex netcdf)
86 - -DENABLE_ROOT=$(usex root)
87 - -DENABLE_TEST=$(usex test)
88 + -DENABLE_TESTS=$(usex test)
89 )
90
91 kde5_src_configure
92
93 diff --git a/sci-visualization/labplot/labplot-9999.ebuild b/sci-visualization/labplot/labplot-9999.ebuild
94 index b6d50918c31..8b114b53331 100644
95 --- a/sci-visualization/labplot/labplot-9999.ebuild
96 +++ b/sci-visualization/labplot/labplot-9999.ebuild
97 @@ -1,4 +1,4 @@
98 -# Copyright 1999-2018 Gentoo Foundation
99 +# Copyright 1999-2018 Gentoo Authors
100 # Distributed under the terms of the GNU General Public License v2
101
102 EAPI=6
103 @@ -30,8 +30,10 @@ COMMON_DEPEND="
104 $(add_frameworks_dep syntax-highlighting)
105 $(add_qt_dep qtconcurrent)
106 $(add_qt_dep qtgui)
107 + $(add_qt_dep qtnetwork)
108 $(add_qt_dep qtprintsupport)
109 $(add_qt_dep qtserialport)
110 + $(add_qt_dep qtsql)
111 $(add_qt_dep qtsvg)
112 $(add_qt_dep qtwidgets)
113 >=sci-libs/gsl-1.15:=