summaryrefslogtreecommitdiff
path: root/sci-visualization/fityk
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-11-25 22:39:15 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-11-25 22:39:15 +0000
commitd934827bf44b7cfcf6711964418148fa60877668 (patch)
tree0625f358789b5e015e49db139cc1dbc9be00428f /sci-visualization/fityk
parent2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
gentoo resync : 25.11.2020
Diffstat (limited to 'sci-visualization/fityk')
-rw-r--r--sci-visualization/fityk/Manifest2
-rw-r--r--sci-visualization/fityk/fityk-1.3.1.ebuild39
2 files changed, 12 insertions, 29 deletions
diff --git a/sci-visualization/fityk/Manifest b/sci-visualization/fityk/Manifest
index 2db9b1fd60d5..c06042cbbcd8 100644
--- a/sci-visualization/fityk/Manifest
+++ b/sci-visualization/fityk/Manifest
@@ -1,3 +1,3 @@
DIST fityk-1.3.1.tar.bz2 1518937 BLAKE2B 6eb13646e1b5cf3fb0763bcf3e91a1877d89f14f1b986f1065fd27052e7110b357c99431a326a6c1fa2ba002300912b922cd3d5589ac5da367d2fbcee209f9a2 SHA512 4a7a65691af8b8d5b47461133b7870ea21ea04ac2ee8ee5714a6b9bab2f072baa6b5d8bf011baba09c62a7ce2dc9d60f3040cc6fdb77dc498b6e03a24fc0fe08
-EBUILD fityk-1.3.1.ebuild 1327 BLAKE2B 3a5eb2bfe86a51256addd901c8a79d4a3d634735a5f37adbf3148724a3c2db4da454ec504a2810ef2a215eff304f3a48605b6e55faf351fb85e77cc7d674f69d SHA512 4693b15dfc6be0626f4c3c3744479aadc8c0f4e109c26c5c48d6766fcaa2157e7ca9614e4be962cfca2f3f94a0f39155d2076863f5f12cc1778c72f696e7b2dc
+EBUILD fityk-1.3.1.ebuild 1029 BLAKE2B 1d51ade0452fbf5d44a9afc06eac9044d588494a483d6cdb72019f3d7778eeb0b9ec97ddd2b3dfe38af628bf9e76d0b98197c594a7080ebc0f1984b034f33bad SHA512 f1df1a0582b529eff406ff7536fecbbd032c2b3fb46667253b11d4ea5726916a0c5383b0b421a1968eaa1080b6f41cc6b42f8850b8f822c4aac8cf866103f1f6
MISC metadata.xml 1378 BLAKE2B a6b73be959353e2a764d5c39ae13c4fe1bc38c5c0ea5a3c2557e32825077e13d0a97504f8d79e338a65803bc98326fe25cb7e86d3aaa8c93c5d9bdce30cbec90 SHA512 38e516a5e0ec249d3ed4e54d4780830e1b53994e9dc1999c664b2f37aac0247df780522e7b25c124ffb0d9766d1292871ec0f9a238c2b3aa9994cef3581befe6
diff --git a/sci-visualization/fityk/fityk-1.3.1.ebuild b/sci-visualization/fityk/fityk-1.3.1.ebuild
index 3900bebeeb70..9a0049bb5d62 100644
--- a/sci-visualization/fityk/fityk-1.3.1.ebuild
+++ b/sci-visualization/fityk/fityk-1.3.1.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
WX_GTK_VER=3.0
-inherit fdo-mime wxwidgets
+inherit wxwidgets xdg
DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
HOMEPAGE="http://fityk.nieto.pl/"
@@ -14,51 +14,34 @@ SRC_URI="https://github.com/wojdyr/${PN}/releases/download/v${PV}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="gnuplot nlopt readline static-libs wxwidgets"
+IUSE="gnuplot nlopt readline wxwidgets"
-CDEPEND="
+DEPEND="
>=dev-lang/lua-5.1:0
dev-libs/boost:=
>=sci-libs/xylib-1
nlopt? ( sci-libs/nlopt )
readline? ( sys-libs/readline:0= )
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )"
-DEPEND="${CDEPEND}
- dev-lang/swig"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
gnuplot? ( sci-visualization/gnuplot )"
-
-pkg_setup() {
- use wxwidgets && setup-wxwidgets
-}
+BDEPEND="dev-lang/swig"
src_configure() {
- common_confargs=(
- --with-wx-config=wx-config-${WX_GTK_VER}
- )
+ use wxwidgets && setup-wxwidgets
econf \
- "${common_confargs[@]}" \
--disable-python \
+ --disable-static \
$(use_enable nlopt) \
$(use_enable wxwidgets GUI) \
$(use_with readline) \
- $(use_enable static-libs static)
+ --with-wx-config="${WX_CONFIG}"
}
src_install() {
default
- # No .pc file / libfityk.a has dependencies -> need .la file
- if ! use static-libs; then
- find "${D}" -name '*.la' -delete || die
- fi
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
+ # no static archives
+ find "${ED}" -name '*.la' -delete || die
}