[gentoo-commits] repo/gentoo:master commit in: sci-visualization/fityk/files/, sci-visualization/fityk/

2024-07-22 Thread Pacho Ramos 
commit: e87c0413bd424647310d4dd6e87f6462a7f15e65
Author: Pacho Ramos  gentoo  org>
AuthorDate: Mon Jul 22 19:07:34 2024 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Mon Jul 22 19:14:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e87c0413

sci-visualization/fityk: drop 1.3.1-r102

Signed-off-by: Pacho Ramos  gentoo.org>

 sci-visualization/fityk/Manifest   |  1 -
 .../fityk/files/fityk-1.3.1-fix-gtk3.patch | 31 
 sci-visualization/fityk/fityk-1.3.1-r102.ebuild| 56 --
 3 files changed, 88 deletions(-)

diff --git a/sci-visualization/fityk/Manifest b/sci-visualization/fityk/Manifest
index efa698d3312a..0b4a1c695591 100644
--- a/sci-visualization/fityk/Manifest
+++ b/sci-visualization/fityk/Manifest
@@ -1,2 +1 @@
-DIST fityk-1.3.1.tar.bz2 1518937 BLAKE2B 
6eb13646e1b5cf3fb0763bcf3e91a1877d89f14f1b986f1065fd27052e7110b357c99431a326a6c1fa2ba002300912b922cd3d5589ac5da367d2fbcee209f9a2
 SHA512 
4a7a65691af8b8d5b47461133b7870ea21ea04ac2ee8ee5714a6b9bab2f072baa6b5d8bf011baba09c62a7ce2dc9d60f3040cc6fdb77dc498b6e03a24fc0fe08
 DIST fityk-1.3.2.tar.bz2 1611794 BLAKE2B 
294d64ed34532e7c126a7128c6f027004c86093293f335d5d900bffc5e1fc6d56b48f8a1ca0739f00b9983f9d21c544a3296a12e187401c0bf429cb545be10d7
 SHA512 
6871358cc1d12479f4ae8d76260412095fa17247b2bd76d7b036be330d73b8aac6d242239aea5c086a2eefad1bc387caa83e5a61452016cd77ea6a88e387aee3

diff --git a/sci-visualization/fityk/files/fityk-1.3.1-fix-gtk3.patch 
b/sci-visualization/fityk/files/fityk-1.3.1-fix-gtk3.patch
deleted file mode 100644
index 7b64f7f582fa..
--- a/sci-visualization/fityk/files/fityk-1.3.1-fix-gtk3.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 85ea545db65d7c6fbb94988b85f1e8cf1c9cbba5 Mon Sep 17 00:00:00 2001
-From: Marcin Wojdyr 
-Date: Sun, 17 Jan 2021 19:18:47 +0100
-Subject: [PATCH] allow building with wxGTK3 (closes #32)
-
-It works, but with some problems.
-
-The separator in wxSplitterWindow is not updated, as per:
-http://trac.wxwidgets.org/ticket/16890
-
-wxSpinCtrl is much wider (it has [+][-] instead of arrows)

- wxgui/app.cpp | 5 -
- 1 file changed, 5 deletions(-)
-
-diff --git a/wxgui/app.cpp b/wxgui/app.cpp
-index 526c8f14..1041eccf 100644
 a/wxgui/app.cpp
-+++ b/wxgui/app.cpp
-@@ -8,11 +8,6 @@
- #include 
- #include 
- 
--#ifdef __WXGTK3__
--#error "Not everything is working with wxGTK3. Use default wxGTK instead, " \
--   "based on GTK+2. If you want to test it, just remove this #error."
--#endif
--
- #include 
- #include 
- #include 

diff --git a/sci-visualization/fityk/fityk-1.3.1-r102.ebuild 
b/sci-visualization/fityk/fityk-1.3.1-r102.ebuild
deleted file mode 100644
index cec78adbde05..
--- a/sci-visualization/fityk/fityk-1.3.1-r102.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-WX_GTK_VER=3.0-gtk3
-
-inherit flag-o-matic lua-single wxwidgets xdg
-
-DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
-HOMEPAGE="https://fityk.nieto.pl/";
-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 wxwidgets"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-DEPEND="
-   ${LUA_DEPS}
-   dev-libs/boost:=
-   >=sci-libs/xylib-1
-   nlopt? ( sci-libs/nlopt )
-   readline? ( sys-libs/readline:0= )
-   wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )"
-RDEPEND="${DEPEND}
-   gnuplot? ( sci-visualization/gnuplot )"
-BDEPEND="dev-lang/swig"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-gtk3.patch )
-
-src_configure() {
-   # codebase relies on dynamic exception specifications
-   # for SWIG, no point in trying to fix at this point.
-   # https://github.com/wojdyr/fityk/pull/38
-   append-cxxflags -std=c++14
-
-   use wxwidgets && setup-wxwidgets
-
-   econf \
-   --disable-python \
-   --disable-static \
-   $(use_enable nlopt) \
-   $(use_enable wxwidgets GUI) \
-   $(use_with readline) \
-   --with-wx-config="${WX_CONFIG}"
-}
-
-src_install() {
-   default
-
-   # no static archives
-   find "${ED}" -name '*.la' -delete || die
-}

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/fityk/

2023-11-24 Thread Pacho Ramos 
commit: 15c76b12cf7728823d0b2b0b7f2d3b69220613da
Author: Pacho Ramos  gentoo  org>
AuthorDate: Fri Nov 24 14:09:25 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Fri Nov 24 14:30:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15c76b12

sci-visualization/fityk: add 1.3.2

Closes: https://bugs.gentoo.org/888603
Signed-off-by: Pacho Ramos  gentoo.org>

 sci-visualization/fityk/Manifest   |  1 +
 sci-visualization/fityk/fityk-1.3.2.ebuild | 56 ++
 2 files changed, 57 insertions(+)

diff --git a/sci-visualization/fityk/Manifest b/sci-visualization/fityk/Manifest
index 76f11e9286ba..efa698d3312a 100644
--- a/sci-visualization/fityk/Manifest
+++ b/sci-visualization/fityk/Manifest
@@ -1 +1,2 @@
 DIST fityk-1.3.1.tar.bz2 1518937 BLAKE2B 
6eb13646e1b5cf3fb0763bcf3e91a1877d89f14f1b986f1065fd27052e7110b357c99431a326a6c1fa2ba002300912b922cd3d5589ac5da367d2fbcee209f9a2
 SHA512 
4a7a65691af8b8d5b47461133b7870ea21ea04ac2ee8ee5714a6b9bab2f072baa6b5d8bf011baba09c62a7ce2dc9d60f3040cc6fdb77dc498b6e03a24fc0fe08
+DIST fityk-1.3.2.tar.bz2 1611794 BLAKE2B 
294d64ed34532e7c126a7128c6f027004c86093293f335d5d900bffc5e1fc6d56b48f8a1ca0739f00b9983f9d21c544a3296a12e187401c0bf429cb545be10d7
 SHA512 
6871358cc1d12479f4ae8d76260412095fa17247b2bd76d7b036be330d73b8aac6d242239aea5c086a2eefad1bc387caa83e5a61452016cd77ea6a88e387aee3

diff --git a/sci-visualization/fityk/fityk-1.3.2.ebuild 
b/sci-visualization/fityk/fityk-1.3.2.ebuild
new file mode 100644
index ..1b1e85c205c7
--- /dev/null
+++ b/sci-visualization/fityk/fityk-1.3.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+WX_GTK_VER=3.2-gtk3
+
+inherit flag-o-matic lua-single wxwidgets xdg
+
+DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
+HOMEPAGE="https://fityk.nieto.pl/";
+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 wxwidgets"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+DEPEND="
+   ${LUA_DEPS}
+   dev-libs/boost:=
+   >=sci-libs/xylib-1
+   nlopt? ( sci-libs/nlopt )
+   readline? ( sys-libs/readline:0= )
+   wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
+"
+RDEPEND="${DEPEND}
+   gnuplot? ( sci-visualization/gnuplot )
+"
+BDEPEND="dev-lang/swig"
+
+src_configure() {
+   # codebase relies on dynamic exception specifications
+   # for SWIG, no point in trying to fix at this point.
+   # https://github.com/wojdyr/fityk/pull/38
+   append-cxxflags -std=c++14
+
+   use wxwidgets && setup-wxwidgets
+
+   econf \
+   --disable-python \
+   --disable-static \
+   $(use_enable nlopt) \
+   $(use_enable wxwidgets GUI) \
+   $(use_with readline) \
+   --with-wx-config="${WX_CONFIG}"
+}
+
+src_install() {
+   default
+   find "${ED}" -name '*.la' -delete || die
+
+   mv "${ED}"/usr/share/appdata "${ED}"/usr/share/metainfo || die
+}

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/fityk/files/, sci-visualization/fityk/

2021-06-16 Thread David Seifert 
commit: cc4ea6b62db21e3022bbaa405bae8388353815e7
Author: David Seifert  gentoo  org>
AuthorDate: Wed Jun 16 08:11:33 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Jun 16 08:11:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc4ea6b6

sci-visualization/fityk: Switch to C++14 mode

* Upstream confirms that the codebase relies on
  dynamic exception specifications for SWIG.

Closes: https://bugs.gentoo.org/787317
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: David Seifert  gentoo.org>

 .../fityk/files/fityk-1.3.1-c++17.patch| 352 -
 ...k-1.3.1-r101.ebuild => fityk-1.3.1-r102.ebuild} |  12 +-
 2 files changed, 7 insertions(+), 357 deletions(-)

diff --git a/sci-visualization/fityk/files/fityk-1.3.1-c++17.patch 
b/sci-visualization/fityk/files/fityk-1.3.1-c++17.patch
deleted file mode 100644
index 66c43207fbf..000
--- a/sci-visualization/fityk/files/fityk-1.3.1-c++17.patch
+++ /dev/null
@@ -1,352 +0,0 @@
-Backport from
-https://github.com/wojdyr/fityk/pull/38
-
 a/fityk/fityk.cpp
-+++ b/fityk/fityk.cpp
-@@ -129,8 +129,7 @@
- delete p_;
- }
- 
--void Fityk::execute(string const& s)  throw(SyntaxError, ExecuteError,
--ExitRequestedException)
-+void Fityk::execute(string const& s)
- {
- try {
- priv_->parse_and_execute_line(s);
-@@ -139,8 +138,7 @@
- CATCH_EXECUTE_ERROR
- }
- 
--string Fityk::get_info(string const& s, int dataset)  throw(SyntaxError,
--ExecuteError)
-+string Fityk::get_info(string const& s, int dataset)
- {
- try {
- string result;
-@@ -152,8 +150,7 @@
- return "";
- }
- 
--realt Fityk::calculate_expr(string const& s, int dataset)  throw(SyntaxError,
--  
ExecuteError)
-+realt Fityk::calculate_expr(string const& s, int dataset)
- {
- try {
- Lexer lex(s.c_str());
-@@ -209,7 +206,7 @@
- return priv_->mgr.functions()[n];
- }
- 
--vector Fityk::get_components(int dataset, char fz)  throw(ExecuteError)
-+vector Fityk::get_components(int dataset, char fz)
- {
- const Model *model = priv_->dk.get_model(hd(priv_, dataset));
- const vector& indexes = model->get_fz(fz).idx;
-@@ -220,7 +217,7 @@
- return ret;
- }
- 
--realt Fityk::get_model_value(realt x, int dataset)  throw(ExecuteError)
-+realt Fityk::get_model_value(realt x, int dataset)
- {
- try {
- return priv_->dk.get_model(hd(priv_, dataset))->value(x);
-@@ -230,7 +227,6 @@
- }
- 
- vector Fityk::get_model_vector(vector const& x, int dataset)
--  throw(ExecuteError)
- {
- vector xx(x);
- vector yy(x.size(), 0.);
-@@ -241,7 +237,7 @@
- return yy;
- }
- 
--const Var* Fityk::get_variable(string const& name)  throw(ExecuteError)
-+const Var* Fityk::get_variable(string const& name)
- {
- try {
- string vname;
-@@ -274,7 +270,6 @@
- }
- 
- void Fityk::load(LoadSpec const& spec, int dataset)
-- throw(ExecuteError)
- {
- if (dataset == DEFAULT_DATASET)
- dataset = priv_->dk.default_idx();
-@@ -290,7 +285,7 @@
-   vector const& x,
-   vector const& y,
-   vector const& sigma,
--  string const& title) throw(ExecuteError)
-+  string const& title)
- {
- try {
- priv_->dk.data(dataset)->load_arrays(x, y, sigma, title);
-@@ -299,7 +294,6 @@
- }
- 
- void Fityk::add_point(realt x, realt y, realt sigma, int dataset)
--  throw(ExecuteError)
- {
- try {
- priv_->dk.data(hd(priv_, dataset))->add_one_point(x, y, sigma);
-@@ -307,7 +301,7 @@
- CATCH_EXECUTE_ERROR
- }
- 
--vector const& Fityk::get_data(int dataset)  throw(ExecuteError)
-+vector const& Fityk::get_data(int dataset)
- {
- static const vector empty;
- try {
-@@ -335,23 +329,21 @@
- }
- 
- void Fityk::set_option_as_string(const string& opt, const string& val)
--
throw(ExecuteError)
- {
- priv_->mutable_settings_mgr()->set_as_string(opt, val);
- }
- 
- void Fityk::set_option_as_number(const string& opt, double val)
--
throw(ExecuteError)
- {
- priv_->mutable_settings_mgr()->set_as_number(opt, val);
- }
- 
--string Fityk::get_option_as_string(const string& opt) const  
throw(ExecuteError)
-+string Fityk::get_option_as_string(const string& opt) const
- {
- return priv_->settings_mgr()->get_as_string(opt, /*quote_str=*/false);
- }
- 
--double Fityk::get_option_as_number(const string& opt) const  
throw(ExecuteError)
-+double Fityk::get_option_as_number(const string& opt) const
- {
- return priv_->settings_mgr()->get_as_

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/fityk/, sci-visualization/fityk/files/

2021-06-15 Thread David Seifert 
commit: e98aa992e96d09f114b7f5404ee6ee788a497b10
Author: Huang Rui  gmail  com>
AuthorDate: Tue Jun 15 09:41:08 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Jun 15 09:41:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e98aa992

sci-visualization/fityk: fix gcc-11 compile

fix error: ISO C++17 does not allow dynamic exception specifications

Closes: https://github.com/gentoo/gentoo/pull/20743
Closes: https://bugs.gentoo.org/787317
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Huang Rui  gmail.com>
Signed-off-by: David Seifert  gentoo.org>

 .../fityk/files/fityk-1.3.1-c++17.patch| 352 +
 .../fityk/files/fityk-1.3.1-fix-gtk3.patch |  31 ++
 ...k-1.3.1-r100.ebuild => fityk-1.3.1-r101.ebuild} |  10 +-
 3 files changed, 390 insertions(+), 3 deletions(-)

diff --git a/sci-visualization/fityk/files/fityk-1.3.1-c++17.patch 
b/sci-visualization/fityk/files/fityk-1.3.1-c++17.patch
new file mode 100644
index 000..66c43207fbf
--- /dev/null
+++ b/sci-visualization/fityk/files/fityk-1.3.1-c++17.patch
@@ -0,0 +1,352 @@
+Backport from
+https://github.com/wojdyr/fityk/pull/38
+
+--- a/fityk/fityk.cpp
 b/fityk/fityk.cpp
+@@ -129,8 +129,7 @@
+ delete p_;
+ }
+ 
+-void Fityk::execute(string const& s)  throw(SyntaxError, ExecuteError,
+-ExitRequestedException)
++void Fityk::execute(string const& s)
+ {
+ try {
+ priv_->parse_and_execute_line(s);
+@@ -139,8 +138,7 @@
+ CATCH_EXECUTE_ERROR
+ }
+ 
+-string Fityk::get_info(string const& s, int dataset)  throw(SyntaxError,
+-ExecuteError)
++string Fityk::get_info(string const& s, int dataset)
+ {
+ try {
+ string result;
+@@ -152,8 +150,7 @@
+ return "";
+ }
+ 
+-realt Fityk::calculate_expr(string const& s, int dataset)  throw(SyntaxError,
+-  
ExecuteError)
++realt Fityk::calculate_expr(string const& s, int dataset)
+ {
+ try {
+ Lexer lex(s.c_str());
+@@ -209,7 +206,7 @@
+ return priv_->mgr.functions()[n];
+ }
+ 
+-vector Fityk::get_components(int dataset, char fz)  throw(ExecuteError)
++vector Fityk::get_components(int dataset, char fz)
+ {
+ const Model *model = priv_->dk.get_model(hd(priv_, dataset));
+ const vector& indexes = model->get_fz(fz).idx;
+@@ -220,7 +217,7 @@
+ return ret;
+ }
+ 
+-realt Fityk::get_model_value(realt x, int dataset)  throw(ExecuteError)
++realt Fityk::get_model_value(realt x, int dataset)
+ {
+ try {
+ return priv_->dk.get_model(hd(priv_, dataset))->value(x);
+@@ -230,7 +227,6 @@
+ }
+ 
+ vector Fityk::get_model_vector(vector const& x, int dataset)
+-  throw(ExecuteError)
+ {
+ vector xx(x);
+ vector yy(x.size(), 0.);
+@@ -241,7 +237,7 @@
+ return yy;
+ }
+ 
+-const Var* Fityk::get_variable(string const& name)  throw(ExecuteError)
++const Var* Fityk::get_variable(string const& name)
+ {
+ try {
+ string vname;
+@@ -274,7 +270,6 @@
+ }
+ 
+ void Fityk::load(LoadSpec const& spec, int dataset)
+- throw(ExecuteError)
+ {
+ if (dataset == DEFAULT_DATASET)
+ dataset = priv_->dk.default_idx();
+@@ -290,7 +285,7 @@
+   vector const& x,
+   vector const& y,
+   vector const& sigma,
+-  string const& title) throw(ExecuteError)
++  string const& title)
+ {
+ try {
+ priv_->dk.data(dataset)->load_arrays(x, y, sigma, title);
+@@ -299,7 +294,6 @@
+ }
+ 
+ void Fityk::add_point(realt x, realt y, realt sigma, int dataset)
+-  throw(ExecuteError)
+ {
+ try {
+ priv_->dk.data(hd(priv_, dataset))->add_one_point(x, y, sigma);
+@@ -307,7 +301,7 @@
+ CATCH_EXECUTE_ERROR
+ }
+ 
+-vector const& Fityk::get_data(int dataset)  throw(ExecuteError)
++vector const& Fityk::get_data(int dataset)
+ {
+ static const vector empty;
+ try {
+@@ -335,23 +329,21 @@
+ }
+ 
+ void Fityk::set_option_as_string(const string& opt, const string& val)
+-
throw(ExecuteError)
+ {
+ priv_->mutable_settings_mgr()->set_as_string(opt, val);
+ }
+ 
+ void Fityk::set_option_as_number(const string& opt, double val)
+-
throw(ExecuteError)
+ {
+ priv_->mutable_settings_mgr()->set_as_number(opt, val);
+ }
+ 
+-string Fityk::get_option_as_string(const string& opt) const  
throw(ExecuteError)
++string Fityk::get_option_as_string(const string& opt) const
+ {
+ return priv_->settings_mgr()->get_as_string(opt, /*quote_str=*/false);
+ }
+ 
+-double Fityk::get_option_as_number(const string& opt) const  
throw(ExecuteE

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/fityk/

2021-01-20 Thread David Seifert 
commit: c77be2e2d702bc25ba132c315347ab3265a7212a
Author: Jakov Smolic  sartura  hr>
AuthorDate: Wed Jan 20 10:16:17 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Jan 20 10:16:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c77be2e2

sci-visualization/fityk: Remove old

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 sci-visualization/fityk/fityk-1.3.1.ebuild | 47 --
 1 file changed, 47 deletions(-)

diff --git a/sci-visualization/fityk/fityk-1.3.1.ebuild 
b/sci-visualization/fityk/fityk-1.3.1.ebuild
deleted file mode 100644
index 8233f353cdc..000
--- a/sci-visualization/fityk/fityk-1.3.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER=3.0
-
-inherit wxwidgets xdg
-
-DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
-HOMEPAGE="https://fityk.nieto.pl/";
-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 wxwidgets"
-
-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} )"
-RDEPEND="${DEPEND}
-   gnuplot? ( sci-visualization/gnuplot )"
-BDEPEND="dev-lang/swig"
-
-src_configure() {
-   use wxwidgets && setup-wxwidgets
-
-   econf \
-   --disable-python \
-   --disable-static \
-   $(use_enable nlopt) \
-   $(use_enable wxwidgets GUI) \
-   $(use_with readline) \
-   --with-wx-config="${WX_CONFIG}"
-}
-
-src_install() {
-   default
-
-   # no static archives
-   find "${ED}" -name '*.la' -delete || die
-}

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/fityk/, profiles/

2020-11-29 Thread Marek Szuba 
commit: d216c3cff2e2d6eea14b9f2f8061946fe575445f
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Nov 29 14:24:02 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Nov 29 15:10:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d216c3cf

sci-visualization/fityk: migrate to lua-single.eclass

Builds and tests fine against all three Lua versions upstream Autoconf
script accepts.

Closes: https://bugs.gentoo.org/752852
Signed-off-by: Marek Szuba  gentoo.org>

 profiles/package.mask   |  1 +
 sci-visualization/fityk/fityk-1.3.1-r100.ebuild | 50 +
 2 files changed, 51 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index 2a997cd3adb..c5d108797df 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -559,6 +559,7 @@ dev-lua/luacrypto
 >=net-im/swift-4.0.2-r100
 >=net-p2p/eiskaltdcpp-2.2.10-r100
 >=sci-visualization/gnuplot-5.4.0-r100
+>=sci-visualization/fityk-1.3.1-r100
 >=www-apache/mod_security-2.9.3-r100
 >=www-client/elinks-0.13.5-r100
 >=www-servers/lighttpd-1.4.55-r100

diff --git a/sci-visualization/fityk/fityk-1.3.1-r100.ebuild 
b/sci-visualization/fityk/fityk-1.3.1-r100.ebuild
new file mode 100644
index 000..fd3cd490339
--- /dev/null
+++ b/sci-visualization/fityk/fityk-1.3.1-r100.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+WX_GTK_VER=3.0
+
+inherit lua-single wxwidgets xdg
+
+DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
+HOMEPAGE="http://fityk.nieto.pl/";
+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 wxwidgets"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+DEPEND="
+   ${LUA_DEPS}
+   dev-libs/boost:=
+   >=sci-libs/xylib-1
+   nlopt? ( sci-libs/nlopt )
+   readline? ( sys-libs/readline:0= )
+   wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )"
+RDEPEND="${DEPEND}
+   gnuplot? ( sci-visualization/gnuplot )"
+BDEPEND="dev-lang/swig"
+
+src_configure() {
+   use wxwidgets && setup-wxwidgets
+
+   econf \
+   --disable-python \
+   --disable-static \
+   $(use_enable nlopt) \
+   $(use_enable wxwidgets GUI) \
+   $(use_with readline) \
+   --with-wx-config="${WX_CONFIG}"
+}
+
+src_install() {
+   default
+
+   # no static archives
+   find "${ED}" -name '*.la' -delete || die
+}

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/fityk/

2020-11-29 Thread Marek Szuba 
commit: 1e6ec230e959f0e537f246246c518c41799937a2
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Nov 29 15:10:30 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Nov 29 15:10:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e6ec230

sci-visualization/fityk: use https in HOMEPAGE

Signed-off-by: Marek Szuba  gentoo.org>

 sci-visualization/fityk/fityk-1.3.1-r100.ebuild | 2 +-
 sci-visualization/fityk/fityk-1.3.1.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-visualization/fityk/fityk-1.3.1-r100.ebuild 
b/sci-visualization/fityk/fityk-1.3.1-r100.ebuild
index fd3cd490339..8a9af85ba44 100644
--- a/sci-visualization/fityk/fityk-1.3.1-r100.ebuild
+++ b/sci-visualization/fityk/fityk-1.3.1-r100.ebuild
@@ -9,7 +9,7 @@ WX_GTK_VER=3.0
 inherit lua-single wxwidgets xdg
 
 DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
-HOMEPAGE="http://fityk.nieto.pl/";
+HOMEPAGE="https://fityk.nieto.pl/";
 SRC_URI="https://github.com/wojdyr/${PN}/releases/download/v${PV}/${P}.tar.bz2";
 
 LICENSE="GPL-2"

diff --git a/sci-visualization/fityk/fityk-1.3.1.ebuild 
b/sci-visualization/fityk/fityk-1.3.1.ebuild
index 9a0049bb5d6..8233f353cdc 100644
--- a/sci-visualization/fityk/fityk-1.3.1.ebuild
+++ b/sci-visualization/fityk/fityk-1.3.1.ebuild
@@ -8,7 +8,7 @@ WX_GTK_VER=3.0
 inherit wxwidgets xdg
 
 DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
-HOMEPAGE="http://fityk.nieto.pl/";
+HOMEPAGE="https://fityk.nieto.pl/";
 SRC_URI="https://github.com/wojdyr/${PN}/releases/download/v${PV}/${P}.tar.bz2";
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/fityk/

2020-10-03 Thread David Seifert 
commit: 81f04b4256e50a07739175703d4fdf673e4d8504
Author: David Seifert  gentoo  org>
AuthorDate: Sat Oct  3 20:56:54 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Oct  3 20:56:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81f04b42

sci-visualization/fityk: Port to EAPI 7

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: David Seifert  gentoo.org>

 sci-visualization/fityk/fityk-1.3.1.ebuild | 39 +-
 1 file changed, 11 insertions(+), 28 deletions(-)

diff --git a/sci-visualization/fityk/fityk-1.3.1.ebuild 
b/sci-visualization/fityk/fityk-1.3.1.ebuild
index 3900bebeeb7..9a0049bb5d6 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
 }

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/fityk/

2020-08-22 Thread Michał Górny 
commit: b3663f1f950826cd09e83226b02d3f3c6d421bed
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Aug 22 09:47:30 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Aug 22 09:51:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3663f1f

sci-visualization/fityk: Eradicate python3.6

Closes: https://bugs.gentoo.org/718510
Signed-off-by: Michał Górny  gentoo.org>

 sci-visualization/fityk/fityk-1.3.1.ebuild | 45 ++
 1 file changed, 2 insertions(+), 43 deletions(-)

diff --git a/sci-visualization/fityk/fityk-1.3.1.ebuild 
b/sci-visualization/fityk/fityk-1.3.1.ebuild
index e67e8dead69..3900bebeeb7 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

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/fityk/

2020-06-21 Thread Andreas Sturmlechner 
commit: ab590352608362ebabf490c414124ab8025c625a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun 21 23:02:41 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jun 21 23:12:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab590352

sci-visualization/fityk: Drop 1.2.9, EAPI5--

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-visualization/fityk/Manifest   |  1 -
 sci-visualization/fityk/fityk-1.2.9.ebuild | 92 --
 2 files changed, 93 deletions(-)

diff --git a/sci-visualization/fityk/Manifest b/sci-visualization/fityk/Manifest
index 1da66de..76f11e9286b 100644
--- a/sci-visualization/fityk/Manifest
+++ b/sci-visualization/fityk/Manifest
@@ -1,2 +1 @@
-DIST fityk-1.2.9.tar.bz2 1370476 BLAKE2B 
30cc6f640bcf3323d592563ce153a47a0e2770f70d0a0cf8ff6a886b1e86421e370cbc142ed89914eb63ed32e35cc6c67c1297bd8680e022ed58697ebe174e5e
 SHA512 
e6d4846a0690ea5e7b94fc067de48d67d6342ff595844d709af9f3b978bf4bd9d0095ce348716fd0053c5575b4bff5825f8f126a53bf7e11f4e6e8a2cc6ddb1a
 DIST fityk-1.3.1.tar.bz2 1518937 BLAKE2B 
6eb13646e1b5cf3fb0763bcf3e91a1877d89f14f1b986f1065fd27052e7110b357c99431a326a6c1fa2ba002300912b922cd3d5589ac5da367d2fbcee209f9a2
 SHA512 
4a7a65691af8b8d5b47461133b7870ea21ea04ac2ee8ee5714a6b9bab2f072baa6b5d8bf011baba09c62a7ce2dc9d60f3040cc6fdb77dc498b6e03a24fc0fe08

diff --git a/sci-visualization/fityk/fityk-1.2.9.ebuild 
b/sci-visualization/fityk/fityk-1.2.9.ebuild
deleted file mode 100644
index 6f6ef3beea2..000
--- a/sci-visualization/fityk/fityk-1.2.9.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools-utils fdo-mime python-r1 wxwidgets
-
-DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
-HOMEPAGE="http://fityk.nieto.pl/";
-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 python static-libs wxwidgets"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
-   >=sci-libs/xylib-1
-   >=dev-lang/lua-5.1:0
-   nlopt? ( sci-libs/nlopt )
-   python? ( ${PYTHON_DEPS} )
-   readline? ( sys-libs/readline:* )
-   wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )"
-DEPEND="${CDEPEND}
-   dev-libs/boost
-   dev-lang/swig"
-RDEPEND="${CDEPEND}
-   gnuplot? ( sci-visualization/gnuplot )"
-
-src_prepare() {
-   use python && python_copy_sources
-   autotools-utils_src_prepare
-}
-
-src_configure() {
-   local myeconfargs=(
-   --docdir="${EPREFIX}/usr/share/doc/${PF}"
-   --disable-xyconvert
-   --disable-python
-   $(use_enable nlopt)
-   $(use_enable wxwidgets GUI)
-   $(use_with readline)
-   )
-   autotools-utils_src_configure
-   if use python; then
-   myeconfargs=(
-   --disable-xyconvert
-   --enable-python
-   --disable-nlopt
-   --disable-GUI
-   --without-readline )
-   python_foreach_impl autotools-utils_src_configure
-   fi
-}
-
-src_compile() {
-   autotools-utils_src_compile
-   if use python; then
-   python_compilation() {
-   cd  "${BUILD_DIR}"/fityk || die
-   einfo "in ${PWD}"
-   emake swig/_fityk.la
-   }
-   python_foreach_impl python_compilation
-   fi
-}
-
-src_install() {
-   autotools-utils_src_install
-   if use python; then
-   python_installation() {
-   cd  "${BUILD_DIR}"/fityk || die
-   emake DESTDIR="${D}" install-pyexecLTLIBRARIES
-   rm "${D}"/$(python_get_sitedir)/*.la || die
-   }
-   python_foreach_impl python_installation
-   fi
-}
-
-pkg_postinst() {
-   fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-   fdo-mime_desktop_database_update
-}

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/fityk/

2020-05-07 Thread Michał Górny 
commit: a9afab79b385ffbb8669a39f52f8b054ed95b891
Author: Michał Górny  gentoo  org>
AuthorDate: Thu May  7 15:15:59 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu May  7 15:15:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9afab79

sci-visualization/fityk: Remove py2.7

Signed-off-by: Michał Górny  gentoo.org>

 sci-visualization/fityk/fityk-1.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-visualization/fityk/fityk-1.3.1.ebuild 
b/sci-visualization/fityk/fityk-1.3.1.ebuild
index 3864d5a4a6f..e67e8dead69 100644
--- a/sci-visualization/fityk/fityk-1.3.1.ebuild
+++ b/sci-visualization/fityk/fityk-1.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 WX_GTK_VER=3.0
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit fdo-mime python-r1 wxwidgets

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/fityk/

2018-06-26 Thread Pacho Ramos 
commit: 55ddc8c7dc508f74b5d37dbb849b00f538efc2dc
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue Jun 26 20:03:59 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue Jun 26 20:28:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55ddc8c7

sci-visualization/fityk: Support python3.6

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sci-visualization/fityk/fityk-1.3.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-visualization/fityk/fityk-1.3.1.ebuild 
b/sci-visualization/fityk/fityk-1.3.1.ebuild
index 309321d1e37..79fd660aecd 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 WX_GTK_VER=3.0
 
-PYTHON_COMPAT=( python2_7 python{3_4,3_5} )
+PYTHON_COMPAT=( python2_7 python{3_4,3_5,3_6} )
 
 inherit fdo-mime python-r1 wxwidgets

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/fityk/, sci-visualization/fig2sxd/, sci-visualization/g3data/, ...

2017-12-09 Thread Ulrich Müller 
commit: 6aecb816e0c1fc8bc08d879d18146562ab03f283
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Dec  9 21:07:40 2017 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Dec  9 23:43:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aecb816

sci-visualization: Update Manifest hashes.

 sci-visualization/circos/Manifest   | 2 +-
 sci-visualization/epix/Manifest | 2 +-
 sci-visualization/fig2sxd/Manifest  | 2 +-
 sci-visualization/fityk/Manifest| 4 ++--
 sci-visualization/g3data/Manifest   | 2 +-
 sci-visualization/gcalc/Manifest| 2 +-
 sci-visualization/gfsview/Manifest  | 2 +-
 sci-visualization/ggobi/Manifest| 4 ++--
 sci-visualization/gle/Manifest  | 8 
 sci-visualization/gnuplot/Manifest  | 6 +++---
 sci-visualization/grace/Manifest| 8 
 sci-visualization/gri/Manifest  | 2 +-
 sci-visualization/gwyddion/Manifest | 4 ++--
 sci-visualization/kst/Manifest  | 2 +-
 sci-visualization/labplot/Manifest  | 2 +-
 sci-visualization/mayavi/Manifest   | 4 ++--
 sci-visualization/nonolith-connect/Manifest | 2 +-
 sci-visualization/opendx-samples/Manifest   | 4 ++--
 sci-visualization/opendx/Manifest   | 4 ++--
 sci-visualization/paraview/Manifest | 4 ++--
 sci-visualization/pythonprop/Manifest   | 4 ++--
 sci-visualization/pyxplot/Manifest  | 2 +-
 sci-visualization/qtiplot/Manifest  | 6 +++---
 sci-visualization/quickplot/Manifest| 6 +++---
 sci-visualization/spectromatic/Manifest | 2 +-
 sci-visualization/spyview/Manifest  | 2 +-
 sci-visualization/veusz/Manifest| 4 ++--
 sci-visualization/visit/Manifest| 2 +-
 sci-visualization/xd3d/Manifest | 2 +-
 sci-visualization/xds-viewer/Manifest   | 2 +-
 sci-visualization/xgraph/Manifest   | 4 ++--
 sci-visualization/xyscan/Manifest   | 2 +-
 sci-visualization/yt/Manifest   | 4 ++--
 sci-visualization/zhu3d/Manifest| 4 ++--
 34 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/sci-visualization/circos/Manifest 
b/sci-visualization/circos/Manifest
index a749ed41ec8..0f6d694e6c2 100644
--- a/sci-visualization/circos/Manifest
+++ b/sci-visualization/circos/Manifest
@@ -1 +1 @@
-DIST circos-0.55.tgz 10163948 SHA256 
3c9f3302b7becb8300d31153d9f8db5552491cb21f5b4cb2f3dc4ca9fd2a362d SHA512 
3ebad082acd96b27281e6fcd996fb79022d982a93db59e1f3589a341df7f9855d7554fb92c88c41dc4679e7273d11c0372285a4059ec14a77f11d1d4014db9c1
 WHIRLPOOL 
4c242fbea59095f24d08eb18c9c9e145e6c7b783581297698a8b21d702019d621709a233bf4ba06928f00ced4eb9e50674f338d12265eaf948533a7ef0a2e251
+DIST circos-0.55.tgz 10163948 BLAKE2B 
b4dc821e99ea4ea072b6b2819f257eba920b133f4f4a10ddd119b073c067ba80dff1ffa1377d5b888098d25cf2eea8c92879444bd6a493b3743ab869b45f5302
 SHA512 
3ebad082acd96b27281e6fcd996fb79022d982a93db59e1f3589a341df7f9855d7554fb92c88c41dc4679e7273d11c0372285a4059ec14a77f11d1d4014db9c1

diff --git a/sci-visualization/epix/Manifest b/sci-visualization/epix/Manifest
index 24bfead2392..a31bf1db68b 100644
--- a/sci-visualization/epix/Manifest
+++ b/sci-visualization/epix/Manifest
@@ -1 +1 @@
-DIST epix-1.2.11_withpdf.tar.bz2 1709429 SHA256 
e6186a5564e26195887dadd94dba9c0ba596a1402cb5b9866dea10abc66ef4d7 SHA512 
16d0edf13711e469a13faba83d47fbab983277a95cfed0e343089258da0b8a56104af9fc217aaa70928c50f10e7d152df93c3638cf2a65a2833142645a829a45
 WHIRLPOOL 
1540b35b87f7c663a37b45a8c33e3d9b93f07f10d6c54da7df4262b1a685be30ec65ddebd5c6d7030dd3f1c86a990223db05cfc5f93840265b56f902f085536a
+DIST epix-1.2.11_withpdf.tar.bz2 1709429 BLAKE2B 
db9cba5b94e27742347f8fc85366399016438681a7016077966e5048b9a178404af8305da7d170722aaac82d85283552f87fbba76b21e788fee546b0e0aebf43
 SHA512 
16d0edf13711e469a13faba83d47fbab983277a95cfed0e343089258da0b8a56104af9fc217aaa70928c50f10e7d152df93c3638cf2a65a2833142645a829a45

diff --git a/sci-visualization/fig2sxd/Manifest 
b/sci-visualization/fig2sxd/Manifest
index 428f8583cba..821bfecd619 100644
--- a/sci-visualization/fig2sxd/Manifest
+++ b/sci-visualization/fig2sxd/Manifest
@@ -1 +1 @@
-DIST fig2sxd_0.22.1.orig.tar.gz 26474 SHA256 
de6d740a64fde7bad0a65b3a63fe29bb7f647e28a643fc6c6740b6c197d55d73 SHA512 
cc407f68e1d82f05566cce8d19bc3f64f4b39c338629b393d3c3d7770c6c69499943c247ddc9bebf1193bab6c4896d28c3b771ed29cfa751a0b6184847a0fc4a
 WHIRLPOOL 
5276ef7a30e3f6886255723ec108b3b78ed5ca51ebe078698d3ee523ccb41b36ed861f4355f8765316f39e3aada3fa5018e9094fe3c496b383aea45456eccb06
+DIST fig2sxd_0.22.1.orig.tar.gz 26474 BLAKE2B 
b6d131f37edca2c810bd7366253f70dac4448b1d1504d15e82751b97c8dd8c8f686128b4bac26290902eb93bb833dc926e28901f9d173108e476f1b924f37699
 SHA512 
cc407f68e1d82f05566cce8d19bc3f64f4b39c338629b393d3c3d7770c6c69499943c247ddc9bebf1193bab6c4896d28c3b771ed29cfa751a0b6184847a0fc4a

diff --git a/sci-visualization/fityk/Manifest

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/fityk/

2017-02-23 Thread Mart Raudsepp 
commit: a8cfe88d3f1945e3ca93f885c38a0b21e863cfe1
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Feb 23 23:13:15 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Feb 23 23:13:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8cfe88d

sci-visualization/fityk: remove old that use wxGTK:2.9

Acked-by: David Seifert  gentoo.org>
Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-visualization/fityk/Manifest   |  1 -
 sci-visualization/fityk/fityk-1.2.1.ebuild | 90 --
 2 files changed, 91 deletions(-)

diff --git a/sci-visualization/fityk/Manifest b/sci-visualization/fityk/Manifest
index cd2052159d..c79942c173 100644
--- a/sci-visualization/fityk/Manifest
+++ b/sci-visualization/fityk/Manifest
@@ -1,3 +1,2 @@
-DIST fityk-1.2.1.tar.bz2 1216009 SHA256 
b98c88649b72fe7bf34507caf09008090bb13d0167cb1f9d0af6cba0fbb51ee0 SHA512 
c81797c8609500ae21842d5d8a0557ded98453946826e6a9dde452af8789eb6ed393162eb3414946599762953e27c8849b827fbb9a53f80330fe244c3881a40c
 WHIRLPOOL 
bb76d394ce0a182a30ac1e6dceca67cf603b7789a480e0c5aa11b70e30837c19087e01843356fb778e1999e22d77544da0936c64056b32ad37e9ea34f45252cc
 DIST fityk-1.2.9.tar.bz2 1370476 SHA256 
615f30296e6e6ed0cad3dfe4fd139b552c25437d6afd371652de4bd12c1a89be SHA512 
e6d4846a0690ea5e7b94fc067de48d67d6342ff595844d709af9f3b978bf4bd9d0095ce348716fd0053c5575b4bff5825f8f126a53bf7e11f4e6e8a2cc6ddb1a
 WHIRLPOOL 
5f60429565d8a301bcec11be660df9c8cd69b03a94375de14215e74f56b8a878038bb0b9e81658ad5ac4fecd5ff7d127cb6ba992e19a98a21ad49941d42247a5
 DIST fityk-1.3.1.tar.bz2 1518937 SHA256 
3d88feb96dbdca70fbfb5f8fa994cea01e77723751e5957094ca46a0c6d511fe SHA512 
4a7a65691af8b8d5b47461133b7870ea21ea04ac2ee8ee5714a6b9bab2f072baa6b5d8bf011baba09c62a7ce2dc9d60f3040cc6fdb77dc498b6e03a24fc0fe08
 WHIRLPOOL 
cbda2c70beae7ced2b132158fa815dd662500cf83235ea39e12ab31f99fac27af4be3e632f1dc768018fc19c9bc563d62e6a08fea9c4e56d37fc382b509b47a8

diff --git a/sci-visualization/fityk/fityk-1.2.1.ebuild 
b/sci-visualization/fityk/fityk-1.2.1.ebuild
deleted file mode 100644
index bf5d1bc01f..00
--- a/sci-visualization/fityk/fityk-1.2.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="2.9"
-GITHUB_USER="wojdyr"
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit autotools-utils fdo-mime python-r1 wxwidgets
-
-DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
-HOMEPAGE="http://fityk.nieto.pl/";
-SRC_URI="mirror://github/${GITHUB_USER}/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="gnuplot nlopt readline python static-libs wxwidgets"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
-   >=sci-libs/xylib-1
-   >=dev-lang/lua-5.1:0
-   nlopt? ( sci-libs/nlopt )
-   python? ( ${PYTHON_DEPS} )
-   readline? ( sys-libs/readline:0= )
-   wxwidgets? ( >=x11-libs/wxGTK-2.9.2:2.9 )"
-DEPEND="${CDEPEND}
-   dev-libs/boost
-   dev-lang/swig"
-RDEPEND="${CDEPEND}
-   gnuplot? ( sci-visualization/gnuplot )"
-
-src_configure() {
-   local myeconfargs=(
-   --docdir="${EPREFIX}/usr/share/doc/${PF}"
-   --disable-xyconvert
-   --disable-python
-   $(use_enable nlopt)
-   $(use_enable wxwidgets GUI)
-   $(use_with readline)
-   )
-   autotools-utils_src_configure
-   if use python; then
-   myeconfargs=(
-   --disable-xyconvert
-   --enable-python
-   --disable-nlopt
-   --disable-GUI
-   --without-readline )
-   python_foreach_impl autotools-utils_src_configure
-   fi
-}
-
-src_compile() {
-   autotools-utils_src_compile
-   python_copy_sources
-   if use python; then
-   python_compilation() {
-   pushd "${BUILD_DIR}"/fityk
-   einfo "in ${PWD}"
-   emake swig/_fityk.la
-   popd
-   }
-   python_foreach_impl python_compilation
-   fi
-}
-
-src_install() {
-   autotools-utils_src_install
-   if use python; then
-   python_installation() {
-   pushd "${BUILD_DIR}"/fityk
-   emake DESTDIR="${D}" install-pyexecLTLIBRARIES
-   popd
-   }
-   python_foreach_impl python_installation
-   fi
-}
-
-pkg_postinst() {
-   fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-   fdo-mime_desktop_database_update
-}

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/fityk/

2017-01-29 Thread David Seifert 
commit: ec1edfa36d2a67e237782996580afce38f7c2a88
Author: Gerhard Bräunlich  gmx  net>
AuthorDate: Sat Jan 28 23:34:52 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jan 29 22:51:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec1edfa3

sci-visualization/fityk: Version bump to 1.3.1, EAPI bump 5 -> 6

Package-Manager: portage-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/3701

 sci-visualization/fityk/Manifest   |   1 +
 sci-visualization/fityk/fityk-1.3.1.ebuild | 106 +
 2 files changed, 107 insertions(+)

diff --git a/sci-visualization/fityk/Manifest b/sci-visualization/fityk/Manifest
index d7d4372..cd20521 100644
--- a/sci-visualization/fityk/Manifest
+++ b/sci-visualization/fityk/Manifest
@@ -1,2 +1,3 @@
 DIST fityk-1.2.1.tar.bz2 1216009 SHA256 
b98c88649b72fe7bf34507caf09008090bb13d0167cb1f9d0af6cba0fbb51ee0 SHA512 
c81797c8609500ae21842d5d8a0557ded98453946826e6a9dde452af8789eb6ed393162eb3414946599762953e27c8849b827fbb9a53f80330fe244c3881a40c
 WHIRLPOOL 
bb76d394ce0a182a30ac1e6dceca67cf603b7789a480e0c5aa11b70e30837c19087e01843356fb778e1999e22d77544da0936c64056b32ad37e9ea34f45252cc
 DIST fityk-1.2.9.tar.bz2 1370476 SHA256 
615f30296e6e6ed0cad3dfe4fd139b552c25437d6afd371652de4bd12c1a89be SHA512 
e6d4846a0690ea5e7b94fc067de48d67d6342ff595844d709af9f3b978bf4bd9d0095ce348716fd0053c5575b4bff5825f8f126a53bf7e11f4e6e8a2cc6ddb1a
 WHIRLPOOL 
5f60429565d8a301bcec11be660df9c8cd69b03a94375de14215e74f56b8a878038bb0b9e81658ad5ac4fecd5ff7d127cb6ba992e19a98a21ad49941d42247a5
+DIST fityk-1.3.1.tar.bz2 1518937 SHA256 
3d88feb96dbdca70fbfb5f8fa994cea01e77723751e5957094ca46a0c6d511fe SHA512 
4a7a65691af8b8d5b47461133b7870ea21ea04ac2ee8ee5714a6b9bab2f072baa6b5d8bf011baba09c62a7ce2dc9d60f3040cc6fdb77dc498b6e03a24fc0fe08
 WHIRLPOOL 
cbda2c70beae7ced2b132158fa815dd662500cf83235ea39e12ab31f99fac27af4be3e632f1dc768018fc19c9bc563d62e6a08fea9c4e56d37fc382b509b47a8

diff --git a/sci-visualization/fityk/fityk-1.3.1.ebuild 
b/sci-visualization/fityk/fityk-1.3.1.ebuild
new file mode 100644
index ..3590f3a
--- /dev/null
+++ b/sci-visualization/fityk/fityk-1.3.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+WX_GTK_VER=3.0
+
+PYTHON_COMPAT=( python2_7 python{3_4,3_5} )
+
+inherit fdo-mime python-r1 wxwidgets
+
+DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
+HOMEPAGE="http://fityk.nieto.pl/";
+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} )"
+
+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}
+   dev-lang/swig"
+RDEPEND="${CDEPEND}
+   gnuplot? ( sci-visualization/gnuplot )"
+
+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}
+   )
+
+   econf \
+   "${common_confargs[@]}" \
+   --disable-python \
+   $(use_enable nlopt) \
+   $(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
+   fi
+}
+
+pkg_postinst() {
+   fdo-mime

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/fityk/

2017-01-29 Thread David Seifert 
commit: ea8332585ef77cdd7183620889accc2f8dce68da
Author: Gerhard Bräunlich  gmx  net>
AuthorDate: Sat Jan 28 23:33:07 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jan 29 22:51:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea833258

sci-visualization/fityk: Fixing URI to use thirdpartymirror

Package-Manager: portage-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/3701

 sci-visualization/fityk/fityk-1.2.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-visualization/fityk/fityk-1.2.1.ebuild 
b/sci-visualization/fityk/fityk-1.2.1.ebuild
index 48a59d3..bf5d1bc 100644
--- a/sci-visualization/fityk/fityk-1.2.1.ebuild
+++ b/sci-visualization/fityk/fityk-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ inherit autotools-utils fdo-mime python-r1 wxwidgets
 
 DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
 HOMEPAGE="http://fityk.nieto.pl/";
-SRC_URI="https://github.com/downloads/${GITHUB_USER}/${PN}/${P}.tar.bz2";
+SRC_URI="mirror://github/${GITHUB_USER}/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"