Version bump

Package-Manager: portage-2.2_rc41/cvs/Linux x86_64

5 files changed, 66 insertions, 100 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/Manifest b/sci-visualization/fityk/Manifest
index 04bff27d4fa6..dfbc72d2a905 100644
--- a/sci-visualization/fityk/Manifest
+++ b/sci-visualization/fityk/Manifest
@@ -1,18 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX fityk-0.8.6-3rdparty.patch 1055 RMD160 5685ea6a60f6c9ea86b6173ed89afd9b1085ebe1 SHA1 ed33e919e09d18d9bbfb8a57a07b3aee1ff878e5 SHA256 933f46906a1ebf2b3094eb52d3a1357d436af8b882c4e6d571d0a7380eae5d58
 AUX fityk-0.8.7-3rdparty.patch 979 RMD160 7c2a028fa59510fd90b338c50dd3ead02eba31a1 SHA1 b2f577a7f1aa4f572ec31e8e1f13356323cd68be SHA256 cd935439fb422e0ddd957a9fc5448c01e0b0644446f2e7e44dfe44278329ac21
-DIST fityk-0.8.6.tar.bz2 1410082 RMD160 c4e32c9c8146968443c5eadb48feeca737f03f92 SHA1 9d1063e015aa214c3cc37da15b87a63978733ca2 SHA256 a6143bba9f080c16eacbddf3d03fdac1f705c9605249d974ff892435dc1d99ec
 DIST fityk-0.8.7.tar.bz2 1498789 RMD160 d2fe98f2ce17d00a3b3480dc3c202a9221b49de3 SHA1 2afa6e9c2d550256259abe9023b065661da2ea87 SHA256 a755d35fde6c7136b47d5473c03067781e4ec20c63a5a7baec0cfceda3a1bdca
-EBUILD fityk-0.8.6.ebuild 1401 RMD160 1ac0362a0ffe3996bb919381ad7af9abbc16294a SHA1 aa6709a644621d6d3baf0d6ef1fa9c860ed3fec2 SHA256 7caf2bd31e304630e722459644e9cf45da328090b314b4f15ea703695d145848
+DIST fityk-0.8.9.tar.bz2 1496932 RMD160 f3b3be9b285361cd202d6a932d7e1701704184d1 SHA1 7815010529f374ed8bc7a7efe25278412a3f7708 SHA256 b25aede322cde89c775e911ac9a5a90095836db78f0cbc443cbbf6c99a8027b6
 EBUILD fityk-0.8.7.ebuild 1403 RMD160 62c5d73f42f54ab80d10f66703ce5183d0f54e6c SHA1 db39f85b95b1cfa6f08e4c8fbf8ffa2d1a53fa12 SHA256 7ae76ebb387ec63fc93caa819c9e1ee9df96577a242ccbec7fb8298c78be7c27
-MISC ChangeLog 1439 RMD160 55b900b9561c82157934f176e2312019abb484ad SHA1 768d61c38df2188e491b6a261cdf67890f030f2f SHA256 345961c970302f559f4d82c7ee6a1a9636ad920d57fe5b0fe587085b0ecbfb8f
+EBUILD fityk-0.8.9.ebuild 1278 RMD160 0dd39d80bd1567791c0219194bb173bf53a8e315 SHA1 ec7dee2707a4d2c68ccf959998463b8745b6efa2 SHA256 64b5f450c06d1848e3fde79b0d9485253c5e792972c34a27136e2061758b1b4a
+MISC ChangeLog 1617 RMD160 83c003615756027604b2cc9a5b9fd3ec41e45283 SHA1 43f27c209ae64777fa4df3fe44b98950cee544a9 SHA256 ee267f43f36d8588d59252824ef8af0eacaa4fa53fee9a93edc024a6dd86ea09
 MISC metadata.xml 1094 RMD160 051cca0088806156c3f4e786b9b4bd36541874a0 SHA1 6f394f9c92462dd283ca49be6f285232fd5e1ea6 SHA256 271840e4016f655cc85c7627b659b98837092381a4c1fcc873f195cb04c74d26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.12 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpC7DMACgkQ1ycZbhPLE2C3kQCfT32zuxQU0NFVY8rIDVNb3/zF
-xJ4AoICW6AP5nw+ZC7yOon9okZ/7w326
-=8rxH
+iEYEARECAAYFAkq3D3AACgkQ1ycZbhPLE2CXEQCglaKAGYTSeYkAv7MCfQB6fGNm
+mwcAn0hghknUOqZTNqwYTcWFBin7OjRG
+=rRlP
 -----END PGP SIGNATURE-----
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
+}