Version bump

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 108 insertions, 169 deletions

diff --git a/sci-visualization/fityk/ChangeLog b/sci-visualization/fityk/ChangeLog
index bc4c926375e8..e414c78370a7 100644
--- a/sci-visualization/fityk/ChangeLog
+++ b/sci-visualization/fityk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/fityk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/ChangeLog,v 1.11 2010/05/19 18:51:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/ChangeLog,v 1.12 2010/07/20 16:01:18 bicatali Exp $
+
+*fityk-0.9.3 (20 Jul 2010)
+
+  20 Jul 2010; Sébastien Fabbro <bicatali@gentoo.org> -fityk-0.8.9.ebuild,
+  -fityk-0.9.0.ebuild, -fityk-0.9.1.ebuild, +fityk-0.9.3.ebuild:
+  Version bump
 
 *fityk-0.9.2 (19 May 2010)
 
diff --git a/sci-visualization/fityk/fityk-0.8.9.ebuild b/sci-visualization/fityk/fityk-0.8.9.ebuild
deleted file mode 100644
index f45a1308e0e9..000000000000
--- a/sci-visualization/fityk/fityk-0.8.9.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 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.3 2010/01/06 03:15:22 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}
-	dev-libs/boost
-	>=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"
-	rm -f "${D}"usr/lib*/python*/site-packages/*.la
-	dodoc NEWS README TODO
-}
diff --git a/sci-visualization/fityk/fityk-0.9.0.ebuild b/sci-visualization/fityk/fityk-0.9.0.ebuild
deleted file mode 100644
index f320057db690..000000000000
--- a/sci-visualization/fityk/fityk-0.9.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/fityk-0.9.0.ebuild,v 1.1 2010/01/06 03:15:22 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 lua python readline wxwidgets"
-
-CDEPEND=">=sci-libs/xylib-0.5
-	lua? ( dev-lang/lua )
-	python? ( dev-lang/python )
-	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 )"
-
-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 \
-		--disable-xyconvert \
-		--without-xylib \
-		$(use_enable lua) \
-		$(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"
-	rm -f "${D}"usr/lib*/python*/site-packages/*.la
-	dodoc NEWS README TODO
-}
diff --git a/sci-visualization/fityk/fityk-0.9.1.ebuild b/sci-visualization/fityk/fityk-0.9.1.ebuild
deleted file mode 100644
index d70d0ba3f220..000000000000
--- a/sci-visualization/fityk/fityk-0.9.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/fityk-0.9.1.ebuild,v 1.1 2010/04/12 17:05:45 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 lua python readline wxwidgets"
-
-CDEPEND=">=sci-libs/xylib-0.5
-	lua? ( dev-lang/lua )
-	python? ( dev-lang/python )
-	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 )"
-
-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 \
-		--disable-xyconvert \
-		--without-xylib \
-		$(use_enable lua) \
-		$(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"
-	rm -f "${D}"usr/lib*/python*/site-packages/*.la
-	dodoc NEWS README TODO
-}
diff --git a/sci-visualization/fityk/fityk-0.9.3.ebuild b/sci-visualization/fityk/fityk-0.9.3.ebuild
new file mode 100644
index 000000000000..b0abf7119e42
--- /dev/null
+++ b/sci-visualization/fityk/fityk-0.9.3.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/fityk-0.9.3.ebuild,v 1.1 2010/07/20 16:01:18 bicatali 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://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 lua readline python wxwidgets"
+
+CDEPEND=">=sci-libs/xylib-0.6
+	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 "<dev-libs/boost-1.37" && \
+		sed -i -e 's:impl/directives.hpp:directives.ipp:g' \
+		"${S}/src/optional_suffix.h"
+
+	sed '/^LTLIBRARIES/s:$(pyexec_LTLIBRARIES)::g' \
+		-i swig/Makefile.in
+	if use python; then
+		echo '#!/bin/sh' > config/py-compile
+	fi
+}
+
+src_configure() {
+	econf  \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--disable-xyconvert \
+		$(use_enable lua) \
+		$(use_enable python) \
+		$(use_enable wxwidgets GUI) \
+		$(use_with doc) \
+		$(use_with examples samples) \
+		$(use_with readline)
+}
+
+src_compile() {
+	default
+	if use python; then
+		python_copy_sources swig
+		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 || die
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize ${PN}.py
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup ${PN}.py
+}