1 |
commit: 81f04b4256e50a07739175703d4fdf673e4d8504 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 3 20:56:54 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 3 20:56:54 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81f04b42 |
7 |
|
8 |
sci-visualization/fityk: Port to EAPI 7 |
9 |
|
10 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
12 |
|
13 |
sci-visualization/fityk/fityk-1.3.1.ebuild | 39 +++++++++--------------------- |
14 |
1 file changed, 11 insertions(+), 28 deletions(-) |
15 |
|
16 |
diff --git a/sci-visualization/fityk/fityk-1.3.1.ebuild b/sci-visualization/fityk/fityk-1.3.1.ebuild |
17 |
index 3900bebeeb7..9a0049bb5d6 100644 |
18 |
--- a/sci-visualization/fityk/fityk-1.3.1.ebuild |
19 |
+++ b/sci-visualization/fityk/fityk-1.3.1.ebuild |
20 |
@@ -1,11 +1,11 @@ |
21 |
# Copyright 1999-2020 Gentoo Authors |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
-EAPI=6 |
25 |
+EAPI=7 |
26 |
|
27 |
WX_GTK_VER=3.0 |
28 |
|
29 |
-inherit fdo-mime wxwidgets |
30 |
+inherit wxwidgets xdg |
31 |
|
32 |
DESCRIPTION="General-purpose nonlinear curve fitting and data analysis" |
33 |
HOMEPAGE="http://fityk.nieto.pl/" |
34 |
@@ -14,51 +14,34 @@ SRC_URI="https://github.com/wojdyr/${PN}/releases/download/v${PV}/${P}.tar.bz2" |
35 |
LICENSE="GPL-2" |
36 |
SLOT="0" |
37 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
38 |
-IUSE="gnuplot nlopt readline static-libs wxwidgets" |
39 |
+IUSE="gnuplot nlopt readline wxwidgets" |
40 |
|
41 |
-CDEPEND=" |
42 |
+DEPEND=" |
43 |
>=dev-lang/lua-5.1:0 |
44 |
dev-libs/boost:= |
45 |
>=sci-libs/xylib-1 |
46 |
nlopt? ( sci-libs/nlopt ) |
47 |
readline? ( sys-libs/readline:0= ) |
48 |
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )" |
49 |
-DEPEND="${CDEPEND} |
50 |
- dev-lang/swig" |
51 |
-RDEPEND="${CDEPEND} |
52 |
+RDEPEND="${DEPEND} |
53 |
gnuplot? ( sci-visualization/gnuplot )" |
54 |
- |
55 |
-pkg_setup() { |
56 |
- use wxwidgets && setup-wxwidgets |
57 |
-} |
58 |
+BDEPEND="dev-lang/swig" |
59 |
|
60 |
src_configure() { |
61 |
- common_confargs=( |
62 |
- --with-wx-config=wx-config-${WX_GTK_VER} |
63 |
- ) |
64 |
+ use wxwidgets && setup-wxwidgets |
65 |
|
66 |
econf \ |
67 |
- "${common_confargs[@]}" \ |
68 |
--disable-python \ |
69 |
+ --disable-static \ |
70 |
$(use_enable nlopt) \ |
71 |
$(use_enable wxwidgets GUI) \ |
72 |
$(use_with readline) \ |
73 |
- $(use_enable static-libs static) |
74 |
+ --with-wx-config="${WX_CONFIG}" |
75 |
} |
76 |
|
77 |
src_install() { |
78 |
default |
79 |
|
80 |
- # No .pc file / libfityk.a has dependencies -> need .la file |
81 |
- if ! use static-libs; then |
82 |
- find "${D}" -name '*.la' -delete || die |
83 |
- fi |
84 |
-} |
85 |
- |
86 |
-pkg_postinst() { |
87 |
- fdo-mime_desktop_database_update |
88 |
-} |
89 |
- |
90 |
-pkg_postrm() { |
91 |
- fdo-mime_desktop_database_update |
92 |
+ # no static archives |
93 |
+ find "${ED}" -name '*.la' -delete || die |
94 |
} |