diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /sci-visualization/fityk | |
parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) |
gentoo resync : 25.08.2020
Diffstat (limited to 'sci-visualization/fityk')
-rw-r--r-- | sci-visualization/fityk/Manifest | 2 | ||||
-rw-r--r-- | sci-visualization/fityk/fityk-1.3.1.ebuild | 45 |
2 files changed, 3 insertions, 44 deletions
diff --git a/sci-visualization/fityk/Manifest b/sci-visualization/fityk/Manifest index 124f009009fa..2db9b1fd60d5 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 2149 BLAKE2B a719547248466bd5c9417051f42983097487dfbb0ea29c3964652bd7563c51fe712ad8ad95e52bae72c04f1893cb5db05e9d31b53aad9c766df52d7ee5966310 SHA512 a7df734423246b71afab679b584379ece6802fb28f158dc9407d129ed6e735c6f470f44c37fee545aa22ed4d3efa9a4fe556bf0b1ecce4a9bcfa7f588d0d2b73 +EBUILD fityk-1.3.1.ebuild 1327 BLAKE2B 3a5eb2bfe86a51256addd901c8a79d4a3d634735a5f37adbf3148724a3c2db4da454ec504a2810ef2a215eff304f3a48605b6e55faf351fb85e77cc7d674f69d SHA512 4693b15dfc6be0626f4c3c3744479aadc8c0f4e109c26c5c48d6766fcaa2157e7ca9614e4be962cfca2f3f94a0f39155d2076863f5f12cc1778c72f696e7b2dc 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 e67e8dead69c..3900bebeeb70 100644 --- a/sci-visualization/fityk/fityk-1.3.1.ebuild +++ b/sci-visualization/fityk/fityk-1.3.1.ebuild @@ -5,9 +5,7 @@ EAPI=6 WX_GTK_VER=3.0 -PYTHON_COMPAT=( python3_6 ) - -inherit fdo-mime python-r1 wxwidgets +inherit fdo-mime wxwidgets DESCRIPTION="General-purpose nonlinear curve fitting and data analysis" HOMEPAGE="http://fityk.nieto.pl/" @@ -16,16 +14,13 @@ 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 python readline static-libs wxwidgets" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +IUSE="gnuplot nlopt readline static-libs wxwidgets" CDEPEND=" >=dev-lang/lua-5.1:0 dev-libs/boost:= >=sci-libs/xylib-1 nlopt? ( sci-libs/nlopt ) - python? ( ${PYTHON_DEPS} ) readline? ( sys-libs/readline:0= ) wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )" DEPEND="${CDEPEND} @@ -37,11 +32,6 @@ pkg_setup() { use wxwidgets && setup-wxwidgets } -src_prepare() { - default - use python && python_copy_sources -} - src_configure() { common_confargs=( --with-wx-config=wx-config-${WX_GTK_VER} @@ -54,42 +44,11 @@ src_configure() { $(use_enable wxwidgets GUI) \ $(use_with readline) \ $(use_enable static-libs static) - - if use python; then - python_configure() { - econf \ - "${common_confargs[@]}" \ - --enable-python \ - --disable-nlopt \ - --disable-GUI \ - --without-readline - } - python_foreach_impl run_in_build_dir python_configure - fi -} - -src_compile() { - default - - if use python; then - python_compilation() { - emake -C fityk swig/_fityk.la - } - python_foreach_impl run_in_build_dir python_compilation - fi } src_install() { default - if use python; then - python_installation() { - emake DESTDIR="${D}" -C fityk install-pyexecLTLIBRARIES - rm "${D%/}"/$(python_get_sitedir)/*.la || die - } - python_foreach_impl run_in_build_dir python_installation - fi - # No .pc file / libfityk.a has dependencies -> need .la file if ! use static-libs; then find "${D}" -name '*.la' -delete || die |