Version bump

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

6 files changed, 115 insertions, 180 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/Manifest b/sci-visualization/fityk/Manifest
index db64cca9db69..f5416e9cbfb6 100644
--- a/sci-visualization/fityk/Manifest
+++ b/sci-visualization/fityk/Manifest
@@ -1,20 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST fityk-0.8.9.tar.bz2 1496932 RMD160 f3b3be9b285361cd202d6a932d7e1701704184d1 SHA1 7815010529f374ed8bc7a7efe25278412a3f7708 SHA256 b25aede322cde89c775e911ac9a5a90095836db78f0cbc443cbbf6c99a8027b6
-DIST fityk-0.9.0.tar.bz2 1593059 RMD160 dbb65d994bb44459540def8467de5bd746f86a08 SHA1 afc87c912fa03de44b3cb8d69eda4664f8e0980f SHA256 50a2b34f1d3a2f2bdc3e41dcb0ea090210296f3dad62e5ed62c0820704f03985
-DIST fityk-0.9.1.tar.bz2 1607478 RMD160 2a288cbdc7f381afe57b150014b41a18269d474a SHA1 38e6b67ed7690f6b8f4dbb716025f3843dead0ef SHA256 c1215339307d0270b3b6b0d2365abdd51ba72d96141bfbaeaa51ea6c91b0b777
 DIST fityk-0.9.2.tar.bz2 984246 RMD160 3d55cc72665b1aa65c03b635379ba7c93bbe979c SHA1 84a58014815ed4466357ee3e05f47b2b3a935440 SHA256 16c9e85be2191ca3fbc527ff36cffdccf8e2f1ddeb34b2b622482488b604c857
-EBUILD fityk-0.8.9.ebuild 1343 RMD160 24222eec035d61b6135201b80837b0924f45501c SHA1 589d5dcbdfbe98f39dc69a986f6f8518de6b62b5 SHA256 f82e21e3c2380e6708338a3054dff6d88f39a182d1c95004ff85c0f5e6ff5a97
-EBUILD fityk-0.9.0.ebuild 1416 RMD160 1021397abd84471f07a280090ab7d612967e8e57 SHA1 9af46d97f597081ac0fca1ac2af916496c5d1f3c SHA256 ccf2e452c6576e7277872cc166c2c0aaee0c1ce39c2b72a8cc6ff5adb24e9f53
-EBUILD fityk-0.9.1.ebuild 1416 RMD160 b020dacc67144f959a9de1f6e31638d5c321cee5 SHA1 f3cc8a14b465373b53711b9f590a17e13c2dc993 SHA256 804d74a8683bfc01e8c0c00e9a2c6d441b1590846bbebb85ebb11fc29b0dfa7b
+DIST fityk-0.9.3.tar.bz2 980548 RMD160 e12f0e7f5e5ab145ad1522dfaf94d4f524edb139 SHA1 e2da419039327277fee32478d78e09873ef9a05b SHA256 85d522046af0ab20468bbe332a9d266a1e1118295e6e44d97ffd41f62a90a335
 EBUILD fityk-0.9.2.ebuild 2334 RMD160 7d571c15383edde8986ed84ed1bc4f36c95267da SHA1 85e6ca8922ac96c9bbfbf0e7f66d65958140e07e SHA256 8cb13ef6e2efc0efa05744ebdb77e029ed5d29cd13755356f0118af66200aa8b
-MISC ChangeLog 2195 RMD160 c355d70631da0b7db08e10e3895ea06cea30d8e9 SHA1 d908ac09576c1f6439cdd5974befae4544595d56 SHA256 65e690ccdc65c5502ed92600ea1c5a9999af5bff5a3ebc540feec2005bee9dc0
+EBUILD fityk-0.9.3.ebuild 2338 RMD160 45789fcbdd6cf4be1dc18e5f582246a0e526e93b SHA1 0e19bd56bd0f3f3941e87b8e1a4bb4ea35f55ed0 SHA256 81f4b7dd296d0389c4176560ecef59b2fb54e4d28ff937c8cac66c6d6ac0659c
+MISC ChangeLog 2384 RMD160 821e8ba1ae729946dbe244056847322e50edffd9 SHA1 e8537b4c54d50600f03e7d1ec6986045cfc9a24e SHA256 64d51cd2030406fd11a905f8f6728be63a7b7f9876fd6e753a3eadfb687cd589
 MISC metadata.xml 1094 RMD160 051cca0088806156c3f4e786b9b4bd36541874a0 SHA1 6f394f9c92462dd283ca49be6f285232fd5e1ea6 SHA256 271840e4016f655cc85c7627b659b98837092381a4c1fcc873f195cb04c74d26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkv0UWgACgkQgAnW8HDreRZLgACfatHDcCHKs2p0rQXLcJQTw0VU
-VsAAnAhTtvfdmM7O6hLCXQWlYI0ej4gA
-=04d5
+iEYEARECAAYFAkxFyFwACgkQ1ycZbhPLE2D68ACfQsEf3Molc7B2P3A//o75hq9U
+FSAAnRclfonYlrgFnSWsc5FXEIb1msGp
+=dWFm
 -----END PGP SIGNATURE-----
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
+}