Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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: Mon, 03 Sep 2018 18:03:52
Message-Id: 1535997811.73003a1280021d235c196605b0d6380151cc1bce.asturm@gentoo
1 commit: 73003a1280021d235c196605b0d6380151cc1bce
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 3 17:44:11 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 3 18:03:31 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73003a12
7
8 sci-visualization/labplot: 2.5.0 version bump
9
10 Closes: https://bugs.gentoo.org/665176
11 Package-Manager: Portage-2.3.48, Repoman-2.3.10
12
13 sci-visualization/labplot/Manifest | 1 +
14 .../{labplot-9999.ebuild => labplot-2.5.0.ebuild} | 29 +++++-----------------
15 sci-visualization/labplot/labplot-9999.ebuild | 12 +--------
16 3 files changed, 8 insertions(+), 34 deletions(-)
17
18 diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest
19 index eb9705e4b00..146e34d4dfa 100644
20 --- a/sci-visualization/labplot/Manifest
21 +++ b/sci-visualization/labplot/Manifest
22 @@ -1 +1,2 @@
23 DIST labplot-2.4.0-kf5.tar.xz 6038072 BLAKE2B b1116a516f3d94d331584f22aefe4e9e54c0c96e98c08a90929bea1aaf379f04437d39a8644afc7cc7feda3f43881ba552d310ca263ae3fc6db24dbc8fb57777 SHA512 5d29dd7d63d484359e73c8d82d8dbc25a069e1f33829cf75c2a2009ebae2027353ecf578b51806b5f35ae17ec472f5cbfdb4caed2637dc1ecc9229d33033d21b
24 +DIST labplot-2.5.0.tar.xz 11831656 BLAKE2B b6c122509874f1f7a554814b7ac9889b416d36f750ff831773aed313f9eff23abc0809f40f6f591051b287bd1a875af455f5d500ce54130c4d8ddfe5fcfa0870 SHA512 a4b285917e30b0ac00cb8c8ad6827ba3884d95fccc0511a0a317bb2d637e48e6579929c45cfb8bba737bb5a01472a2baa9d812a688730ac4fa40b23cc6625eba
25
26 diff --git a/sci-visualization/labplot/labplot-9999.ebuild b/sci-visualization/labplot/labplot-2.5.0.ebuild
27 similarity index 76%
28 copy from sci-visualization/labplot/labplot-9999.ebuild
29 copy to sci-visualization/labplot/labplot-2.5.0.ebuild
30 index 25cd79c868c..40f32162ebc 100644
31 --- a/sci-visualization/labplot/labplot-9999.ebuild
32 +++ b/sci-visualization/labplot/labplot-2.5.0.ebuild
33 @@ -9,13 +9,11 @@ inherit kde5
34
35 DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks"
36 HOMEPAGE="https://www.kde.org/applications/education/labplot/"
37 -[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}-kf5.tar.xz"
38 +[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
39
40 LICENSE="GPL-2"
41 KEYWORDS=""
42 -IUSE="cantor fftw fits hdf5 libcerf netcdf root"
43 -
44 -[[ ${KDE_BUILD_TYPE} != live ]] && S="${WORKDIR}/${P}-kf5"
45 +IUSE="cantor fftw fits hdf5 libcerf netcdf"
46
47 COMMON_DEPEND="
48 $(add_frameworks_dep karchive)
49 @@ -23,8 +21,10 @@ COMMON_DEPEND="
50 $(add_frameworks_dep kconfig)
51 $(add_frameworks_dep kconfigwidgets)
52 $(add_frameworks_dep kcoreaddons)
53 + $(add_frameworks_dep kdelibs4support)
54 $(add_frameworks_dep ki18n)
55 $(add_frameworks_dep kiconthemes)
56 + $(add_frameworks_dep kio)
57 $(add_frameworks_dep knewstuff)
58 $(add_frameworks_dep ktextwidgets)
59 $(add_frameworks_dep kwidgetsaddons)
60 @@ -37,20 +37,12 @@ COMMON_DEPEND="
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 @@ -61,14 +53,6 @@ RDEPEND="${COMMON_DEPEND}
83 !sci-visualization/labplot:4
84 "
85
86 -src_prepare() {
87 - kde5_src_prepare
88 -
89 - if ! use handbook && [[ ${KDE_BUILD_TYPE} != live ]]; then
90 - cmake_comment_add_subdirectory doc-translations
91 - fi
92 -}
93 -
94 src_configure() {
95 local mycmakeargs=(
96 -DENABLE_CANTOR=$(usex cantor)
97 @@ -77,8 +61,7 @@ src_configure() {
98 -DENABLE_HDF5=$(usex hdf5)
99 -DENABLE_LIBCERF=$(usex libcerf)
100 -DENABLE_NETCDF=$(usex netcdf)
101 - -DENABLE_ROOT=$(usex root)
102 - -DENABLE_TEST=$(usex test)
103 + -DENABLE_TESTS=$(usex test)
104 )
105
106 kde5_src_configure
107
108 diff --git a/sci-visualization/labplot/labplot-9999.ebuild b/sci-visualization/labplot/labplot-9999.ebuild
109 index 25cd79c868c..b6d50918c31 100644
110 --- a/sci-visualization/labplot/labplot-9999.ebuild
111 +++ b/sci-visualization/labplot/labplot-9999.ebuild
112 @@ -9,14 +9,12 @@ inherit kde5
113
114 DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks"
115 HOMEPAGE="https://www.kde.org/applications/education/labplot/"
116 -[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}-kf5.tar.xz"
117 +[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
118
119 LICENSE="GPL-2"
120 KEYWORDS=""
121 IUSE="cantor fftw fits hdf5 libcerf netcdf root"
122
123 -[[ ${KDE_BUILD_TYPE} != live ]] && S="${WORKDIR}/${P}-kf5"
124 -
125 COMMON_DEPEND="
126 $(add_frameworks_dep karchive)
127 $(add_frameworks_dep kcompletion)
128 @@ -61,14 +59,6 @@ RDEPEND="${COMMON_DEPEND}
129 !sci-visualization/labplot:4
130 "
131
132 -src_prepare() {
133 - kde5_src_prepare
134 -
135 - if ! use handbook && [[ ${KDE_BUILD_TYPE} != live ]]; then
136 - cmake_comment_add_subdirectory doc-translations
137 - fi
138 -}
139 -
140 src_configure() {
141 local mycmakeargs=(
142 -DENABLE_CANTOR=$(usex cantor)
Report Message
Find on MARC Find on Google Groups