5 files changed, 49 insertions, 67 deletions
diff --git a/sci-visualization/fityk/ChangeLog b/sci-visualization/fityk/ChangeLog
index a144aa6ed79c..595430c37809 100644
--- a/sci-visualization/fityk/ChangeLog
+++ b/sci-visualization/fityk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-visualization/fityk
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/ChangeLog,v 1.3 2008/07/13 17:39:33 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/ChangeLog,v 1.4 2008/08/22 18:06:19 bicatali Exp $
+
+  22 Aug 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/fityk-0.8.4-as-needed.patch, +files/fityk-0.8.6-3rdparty.patch,
+  -fityk-0.8.4.ebuild, fityk-0.8.6.ebuild:
+  Removed building of xylib, closing bug #235289
 
   13 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org> fityk-0.8.6.ebuild:
   Use internal boost headers for incompatibily between boost::spirit
diff --git a/sci-visualization/fityk/files/fityk-0.8.4-as-needed.patch b/sci-visualization/fityk/files/fityk-0.8.4-as-needed.patch
deleted file mode 100644
index 6deb72994b03..000000000000
--- a/sci-visualization/fityk/files/fityk-0.8.4-as-needed.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Makefile.in.orig	2008-02-15 11:46:35.000000000 +0000
-+++ src/Makefile.in	2008-02-15 11:48:16.000000000 +0000
-@@ -265,6 +265,7 @@
- lib_LTLIBRARIES = libfityk.la 
- libfityk_la_LDFLAGS = @LIBRARY_VERSION_FLAG@
- libfityk_la_CPPFLAGS = @CPPFLAGS_3RDPARTY@ 
-+libfityk_la_LIBADD = @XYLIB_LDADD@
- libfityk_la_SOURCES = logic.cpp view.cpp cmd3.cpp cmd2.cpp cmd.cpp common.cpp \
- 		 var.cpp mgr.cpp func.cpp bfunc.cpp calc.cpp ast.cpp \
- 		 data.cpp datatrans.cpp datatrans2.cpp datatrans3.cpp \
diff --git a/sci-visualization/fityk/files/fityk-0.8.6-3rdparty.patch b/sci-visualization/fityk/files/fityk-0.8.6-3rdparty.patch
new file mode 100644
index 000000000000..ad3c7b44be85
--- /dev/null
+++ b/sci-visualization/fityk/files/fityk-0.8.6-3rdparty.patch
@@ -0,0 +1,33 @@
+--- 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.4.ebuild b/sci-visualization/fityk/fityk-0.8.4.ebuild
deleted file mode 100644
index d4d56295d4d1..000000000000
--- a/sci-visualization/fityk/fityk-0.8.4.ebuild
+++ /dev/null
@@ -1,54 +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.4.ebuild,v 1.1 2008/02/28 12:09:01 bicatali Exp $
-
-EAPI="1"
-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 wxwindows"
-
-CDEPEND="readline? ( sys-libs/readline )
-	python? ( virtual/python )
-	wxwindows? ( x11-libs/wxGTK:2.8 )"
-
-DEPEND="${CDEPEND}
-	dev-libs/boost
-	python? ( dev-lang/swig )"
-
-RDEPEND="${CDEPEND}
-	gnuplot? ( sci-visualization/gnuplot )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-}
-
-src_compile() {
-	econf  \
-		--disable-3rdparty \
-		$(use_enable python) \
-		$(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.6.ebuild b/sci-visualization/fityk/fityk-0.8.6.ebuild
index fbafa99ea41c..377a7ddd3d80 100644
--- a/sci-visualization/fityk/fityk-0.8.6.ebuild
+++ b/sci-visualization/fityk/fityk-0.8.6.ebuild
@@ -1,11 +1,11 @@
 # 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.2 2008/07/13 17:39:33 bicatali Exp $
+# $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 wxwidgets flag-o-matic
+inherit eutils autotools wxwidgets flag-o-matic
 
 DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
 HOMEPAGE="http://www.unipress.waw.pl/fityk/"
@@ -28,6 +28,14 @@ DEPEND="${CDEPEND}"
 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