summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-visualization/fityk')
-rw-r--r--sci-visualization/fityk/ChangeLog8
-rw-r--r--sci-visualization/fityk/files/fityk-0.8.6-3rdparty.patch33
-rw-r--r--sci-visualization/fityk/fityk-0.8.6.ebuild58
-rw-r--r--sci-visualization/fityk/fityk-0.8.9.ebuild52
4 files changed, 59 insertions, 92 deletions
diff --git a/sci-visualization/fityk/ChangeLog b/sci-visualization/fityk/ChangeLog
index d4e8dee46a0c..9d8799cf918b 100644
--- a/sci-visualization/fityk/ChangeLog
+++ b/sci-visualization/fityk/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sci-visualization/fityk
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/ChangeLog,v 1.6 2009/06/25 03:16:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/ChangeLog,v 1.7 2009/09/21 05:30:15 bicatali Exp $
+
+*fityk-0.8.9 (21 Sep 2009)
+
+ 21 Sep 2009; Sébastien Fabbro <bicatali@gentoo.org> -fityk-0.8.6.ebuild,
+ -files/fityk-0.8.6-3rdparty.patch, +fityk-0.8.9.ebuild:
+ Version bump
25 Jun 2009; Sébastien Fabbro <bicatali@gentoo.org> fityk-0.8.7.ebuild:
Fixed for older libtool version, thanks polynomial-c, closing bug #275290
diff --git a/sci-visualization/fityk/files/fityk-0.8.6-3rdparty.patch b/sci-visualization/fityk/files/fityk-0.8.6-3rdparty.patch
deleted file mode 100644
index ad3c7b44be85..000000000000
--- a/sci-visualization/fityk/files/fityk-0.8.6-3rdparty.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- configure.ac.orig 2008-08-22 18:36:17.981774040 +0100
-+++ configure.ac 2008-08-22 18:40:08.566914339 +0100
-@@ -119,9 +119,11 @@
- if test "$enable_3rdparty" = "yes"; then
- CPPFLAGS_3RDPARTY="-I\$(top_srcdir)/3rdparty -I\$(top_srcdir)/3rdparty/xylib"
- XYLIB_LDADD="\$(top_builddir)/3rdparty/xylib/xylib/libxy.la"
-+ DIR_3RDPARTY=3rdparty
- else
- CPPFLAGS_3RDPARTY=
- XYLIB_LDADD="-lxy"
-+ DIR_3RDPARTY=
- fi
-
-
-@@ -185,6 +187,7 @@
- AC_SUBST(PYBINDINGDIR)
- AC_SUBST(CPPFLAGS_3RDPARTY)
- AC_SUBST(XYLIB_LDADD)
-+AC_SUBST(DIR_3RDPARTY)
- AC_SUBST(LIBRARY_VERSION_FLAG)
-
- # check for erf and erfc function
---- Makefile.am.orig 2008-08-22 18:36:50.883649011 +0100
-+++ Makefile.am 2008-08-22 18:38:42.550012515 +0100
-@@ -3,7 +3,7 @@
- ACLOCAL_AMFLAGS = -I config
- EXTRA_DIST = fityk.spec fityk.iss fityk.url fityk.svg macosx/
- AUTOMAKE_OPTIONS = dist-bzip2
--SUBDIRS = @DOC@ 3rdparty src samples config @PYBINDINGDIR@
-+SUBDIRS = @DOC@ @DIR_3RDPARTY@ src samples config @PYBINDINGDIR@
-
- icondir = $(datadir)/pixmaps
- desktopdir = $(datadir)/applications
diff --git a/sci-visualization/fityk/fityk-0.8.6.ebuild b/sci-visualization/fityk/fityk-0.8.6.ebuild
deleted file mode 100644
index 377a7ddd3d80..000000000000
--- a/sci-visualization/fityk/fityk-0.8.6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/fityk-0.8.6.ebuild,v 1.3 2008/08/22 18:06:19 bicatali Exp $
-
-EAPI="1"
-WX_GTK_VER="2.8"
-
-inherit eutils autotools wxwidgets flag-o-matic
-
-DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
-HOMEPAGE="http://www.unipress.waw.pl/fityk/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples gnuplot readline wxwindows"
-
-CDEPEND="sci-libs/xylib
- readline? ( sys-libs/readline )
- wxwindows? ( x11-libs/wxGTK:2.8 )"
-
-DEPEND="${CDEPEND}"
-# removing temporarly external boost (see bug #231177)
-# dev-libs/boost"
-
-RDEPEND="${CDEPEND}
- gnuplot? ( sci-visualization/gnuplot )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- # avoid building xylib when 3rdparty is disabled
- epatch "${FILESDIR}"/${P}-3rdparty.patch
- eautoreconf
-}
-
-src_compile() {
- # temporary, see above
- append-cppflags -I../3rdparty
-
- econf \
- --disable-3rdparty \
- $(use_enable wxwindows GUI) \
- $(use_with doc) \
- $(use_with readline) \
- || die "econf failed"
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc NEWS README TODO || die
- rm -f samples/Makefile*
- insinto /usr/share/doc/${PF}
- use examples && doins -r samples
-}
diff --git a/sci-visualization/fityk/fityk-0.8.9.ebuild b/sci-visualization/fityk/fityk-0.8.9.ebuild
new file mode 100644
index 000000000000..593bad98daef
--- /dev/null
+++ b/sci-visualization/fityk/fityk-0.8.9.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/fityk-0.8.9.ebuild,v 1.1 2009/09/21 05:30:15 bicatali Exp $
+
+EAPI=2
+WX_GTK_VER="2.8"
+
+inherit eutils wxwidgets
+
+DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
+HOMEPAGE="http://www.unipress.waw.pl/fityk/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples gnuplot python readline wxwidgets"
+
+CDEPEND=">=sci-libs/xylib-0.4
+ python? ( dev-lang/python )
+ readline? ( sys-libs/readline )
+ wxwidgets? ( x11-libs/wxGTK:2.8 )"
+
+DEPEND="${CDEPEND}
+ >=sys-devel/libtool-2.2"
+
+RDEPEND="${CDEPEND}
+ gnuplot? ( sci-visualization/gnuplot )"
+
+src_prepare() {
+ has_version "<dev-libs/boost-1.37" && \
+ sed -i -e 's:impl/directives.hpp:directives.ipp:g' \
+ "${S}/src/optional_suffix.h"
+}
+
+src_configure() {
+ econf \
+ --docdir="/usr/share/doc/${PF}" \
+ --disable-3rdparty \
+ --without-xylib \
+ $(use_enable python) \
+ $(use_enable wxwidgets GUI) \
+ $(use_with doc) \
+ $(use_with examples samples) \
+ $(use_with readline)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+ dodoc NEWS README TODO
+}