From be9c596e3779891285cfe7b8334878eb8f323e75 Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Wed, 25 Apr 2012 03:15:56 +0000 Subject: Version bump. Tentative fix for random failure which might be due to python-3 set (bug #412805) (Portage version: 2.1.10.56/cvs/Linux x86_64) --- sci-visualization/fityk/ChangeLog | 9 ++- sci-visualization/fityk/fityk-0.9.6.ebuild | 102 ---------------------------- sci-visualization/fityk/fityk-0.9.8.ebuild | 105 +++++++++++++++++++++++++++++ 3 files changed, 113 insertions(+), 103 deletions(-) delete mode 100644 sci-visualization/fityk/fityk-0.9.6.ebuild create mode 100644 sci-visualization/fityk/fityk-0.9.8.ebuild (limited to 'sci-visualization') diff --git a/sci-visualization/fityk/ChangeLog b/sci-visualization/fityk/ChangeLog index 3f455ce1d2d3..1b8e3065123d 100644 --- a/sci-visualization/fityk/ChangeLog +++ b/sci-visualization/fityk/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-visualization/fityk # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/ChangeLog,v 1.18 2012/04/23 17:29:33 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/ChangeLog,v 1.19 2012/04/25 03:15:56 bicatali Exp $ + +*fityk-0.9.8 (25 Apr 2012) + + 25 Apr 2012; Sébastien Fabbro -fityk-0.9.6.ebuild, + +fityk-0.9.8.ebuild: + Version bump. Tentative fix for random failure which might be due to python-3 + set (bug #412805) 23 Apr 2012; Michał Górny fityk-0.9.6.ebuild, fityk-0.9.7.ebuild: diff --git a/sci-visualization/fityk/fityk-0.9.6.ebuild b/sci-visualization/fityk/fityk-0.9.6.ebuild deleted file mode 100644 index 9935ee4bd64d..000000000000 --- a/sci-visualization/fityk/fityk-0.9.6.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/fityk-0.9.6.ebuild,v 1.3 2012/04/23 17:29:33 mgorny Exp $ - -EAPI="3" - -WX_GTK_VER="2.8" - -PYTHON_DEPEND="python? 2" -SUPPORT_PYTHON_ABIS="1" - -inherit python wxwidgets - -DESCRIPTION="General-purpose nonlinear curve fitting and data analysis" -HOMEPAGE="http://fityk.nieto.pl/" -SRC_URI="mirror://github/wojdyr/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples gnuplot lua readline python static-libs wxwidgets" - -CDEPEND=">=sci-libs/xylib-0.8 - lua? ( dev-lang/lua ) - readline? ( sys-libs/readline ) - wxwidgets? ( x11-libs/wxGTK:2.8 )" - -DEPEND="${CDEPEND} - dev-libs/boost - >=sys-devel/libtool-2.2" - -RDEPEND="${CDEPEND} - gnuplot? ( sci-visualization/gnuplot )" - -RESTRICT_PYTHON_ABIS="3.*" - -src_prepare() { - has_version " config/py-compile - fi -} - -src_configure() { - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --disable-xyconvert \ - $(use_enable lua) \ - $(use_enable python) \ - $(use_enable static-libs static) \ - $(use_enable wxwidgets GUI) \ - $(use_with doc) \ - $(use_with examples samples) \ - $(use_with readline) -} - -src_compile() { - use python && python_copy_sources swig - default - if use python; then - compilation() { - emake \ - PYTHON_CPPFLAGS="-I$(python_get_includedir)" \ - PYTHON_LDFLAGS="$(python_get_library -l)" \ - PYTHON_SITE_PKG="$(python_get_sitedir)" \ - PYTHON_VERSION="$(python_get_version)" \ - pyexecdir="$(python_get_sitedir)" \ - _fityk.la - } - python_execute_function -s --source-dir swig compilation - fi -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - if use python; then - installation() { - emake \ - DESTDIR="${D}" \ - pyexecdir="$(python_get_sitedir)" \ - pythondir="$(python_get_sitedir)" \ - install - } - python_execute_function -s --source-dir swig installation - python_clean_installation_image - fi - dodoc NEWS README TODO -} - -pkg_postinst() { - use python && python_mod_optimize ${PN}.py -} - -pkg_postrm() { - use python && python_mod_cleanup ${PN}.py -} diff --git a/sci-visualization/fityk/fityk-0.9.8.ebuild b/sci-visualization/fityk/fityk-0.9.8.ebuild new file mode 100644 index 000000000000..9f7099b1c7b0 --- /dev/null +++ b/sci-visualization/fityk/fityk-0.9.8.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/fityk-0.9.8.ebuild,v 1.1 2012/04/25 03:15:56 bicatali Exp $ + +EAPI=4 + +WX_GTK_VER="2.8" + +# python eclass cruft +PYTHON_DEPEND="python? 2" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.*" + +inherit python wxwidgets + +DESCRIPTION="General-purpose nonlinear curve fitting and data analysis" +HOMEPAGE="http://fityk.nieto.pl/" +SRC_URI="mirror://github/wojdyr/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc examples gnuplot lua readline python static-libs wxwidgets" + +CDEPEND=">=sci-libs/xylib-0.8 + lua? ( dev-lang/lua ) + readline? ( sys-libs/readline ) + wxwidgets? ( x11-libs/wxGTK:2.8[X] )" + +DEPEND="${CDEPEND} + dev-libs/boost + >=sys-devel/libtool-2.2" + +RDEPEND="${CDEPEND} + gnuplot? ( sci-visualization/gnuplot )" + +src_prepare() { + has_version " config/py-compile + fi +} + +src_configure() { + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --disable-xyconvert \ + $(use_enable lua) \ + $(use_enable python) \ + $(use_enable static-libs static) \ + $(use_enable wxwidgets GUI) \ + $(use_with doc) \ + $(use_with readline) +} + +src_compile() { + use python && python_copy_sources swig + default + if use python; then + compilation() { + emake \ + PYTHON_CPPFLAGS="-I$(python_get_includedir)" \ + PYTHON_LDFLAGS="$(python_get_library -l)" \ + PYTHON_SITE_PKG="$(python_get_sitedir)" \ + PYTHON_VERSION="$(python_get_version)" \ + pyexecdir="$(python_get_sitedir)" \ + _fityk.la + } + python_execute_function -s --source-dir swig compilation + fi +} + +src_install() { + default + if use python; then + installation() { + emake \ + DESTDIR="${D}" \ + pyexecdir="$(python_get_sitedir)" \ + pythondir="$(python_get_sitedir)" \ + install install-pyexecLTLIBRARIES + } + python_execute_function -s --source-dir swig installation + python_clean_installation_image + fi + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins samples/* + fi +} + +pkg_postinst() { + use python && python_mod_optimize ${PN}.py +} + +pkg_postrm() { + use python && python_mod_cleanup ${PN}.py +} -- cgit v1.2.3-65-gdbad