Version bump. Switch to EAPI5 and python-r1

Package-Manager: portage-2.2.01.21938-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

5 files changed, 109 insertions, 114 deletions

diff --git a/sci-visualization/fityk/ChangeLog b/sci-visualization/fityk/ChangeLog
index 0492fdda2aa9..dff77d93366e 100644
--- a/sci-visualization/fityk/ChangeLog
+++ b/sci-visualization/fityk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/fityk
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/ChangeLog,v 1.20 2012/08/06 23:39:41 bicatali Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/ChangeLog,v 1.21 2013/06/07 22:48:09 bicatali Exp $
+
+*fityk-1.2.1 (07 Jun 2013)
+
+  07 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> +fityk-1.2.1.ebuild,
+  -fityk-1.2.0.ebuild, metadata.xml:
+  Version bump. Switch to EAPI5 and python-r1
 
 *fityk-1.2.0 (06 Aug 2012)
 
diff --git a/sci-visualization/fityk/Manifest b/sci-visualization/fityk/Manifest
index fc67ddd20fca..1844b21354cd 100644
--- a/sci-visualization/fityk/Manifest
+++ b/sci-visualization/fityk/Manifest
@@ -3,16 +3,16 @@ Hash: SHA256
 
 DIST fityk-0.9.8.tar.bz2 1050468 SHA256 ac9c38979e06b1e848beb02c563c3307cbbd832eca951e05402f777c91bad77c
 DIST fityk-1.1.1.tar.gz 804251 SHA256 a70402fd99a48df8c4c0078c544d4901fab01c9005b52850bbb46712ad5f45e4 SHA512 b170a96deea34b3df9ca729aea4462410e8b178cd7c3be22a1bc6d99ca9cffa019241200cebe422110150d41b1fbd5e126032c79e07dd5b3568e9e4d1745048f WHIRLPOOL 48b33e0af748f80b7fe943a221e07bcd26bbe46d78c72271131d7a32b277141fd2c0b1fcb7a8d1888895ef56d4bb9422641b8045f7ba4cf9ecece1e2171f319f
-DIST fityk-1.2.0.tar.bz2 1199643 SHA256 ea2fa0c8ed6afabae4026e748b91b150ed5832af32af7517adcabb4b6516845b SHA512 073dec7db6a5b36ef83373ec7fc53282a30aaaf5e94a2559ecad7ed1c25a9d77e8eb95d15a4c3499ae55b31ee30b6b638e329a8b8c5bf685436258e822131666 WHIRLPOOL 60c65cec0c1d93145fed303f43a1fa3c46c78128da1edbccc7a0a731f284a41dd046c3593f81d6e475c86ba6490466a3e4bedcff967573012f3dde8c21e51ac8
+DIST fityk-1.2.1.tar.bz2 1216009 SHA256 b98c88649b72fe7bf34507caf09008090bb13d0167cb1f9d0af6cba0fbb51ee0 SHA512 c81797c8609500ae21842d5d8a0557ded98453946826e6a9dde452af8789eb6ed393162eb3414946599762953e27c8849b827fbb9a53f80330fe244c3881a40c WHIRLPOOL bb76d394ce0a182a30ac1e6dceca67cf603b7789a480e0c5aa11b70e30837c19087e01843356fb778e1999e22d77544da0936c64056b32ad37e9ea34f45252cc
 EBUILD fityk-0.9.8.ebuild 2471 SHA256 26fad5f50d639d530ed7f4dc33c9d054f3236b231aee05c126d5563704b136bd SHA512 fe19c37c55add4bcf152356514c3842bce184c41cc98ec4c54d374a5295a6274b55053cce8c219cfd4c8d8df601a9a4ba5b424d6c06135d1782c6dfad771676e WHIRLPOOL 5877f7a8d57c6a0ac51eee73001caa534a9efeb5eb841d3f6a335f03f783bd6336dddc0bcb5bf5b8f0ba0a7cf122e7576987d4d1e7c88eef006e24c2274cce2c
 EBUILD fityk-1.1.1.ebuild 2495 SHA256 3692213c1f743836737252517511873f2b87b55437f835fa47926b64351832ca SHA512 1c171e0fe979eafc482a61e57118ebcda7c8fe2d47daba616f08196a6b3bce333e8dcb53e8df936d738d9f4dc7f0288a21229ac3fa9d4af9d3faa241af34590b WHIRLPOOL a6c8144f34ce24e1e2ec01bf295db8dc28b4e73494ad10bbce70bf5406cb17db8afc4c4f2942825b800f4eaaf0c7c5924bfdea9e4f2be55d20d54b704ece47ee
-EBUILD fityk-1.2.0.ebuild 2489 SHA256 c118fc62e4632c8679df8932deed5d6366ef76e49ea595ba34f6aea867ba7fa8 SHA512 881ae5cd9388ad8a8ed337d9c0bc3882ab6006538f186acca2fd02a1d9476f7fc0265974576ed2df1137ddae30e0ef980faefe2fee654f9762c65aad192f993b WHIRLPOOL ea2fdda53ae595950d4c1aad9f42d6eaaf1799fdeb6a10aaa2f8d4cd037067fb878d49cf3845080eac4138aa811a84babdd2c7c891539b9e109f3ec26e3e7fcc
-MISC ChangeLog 3692 SHA256 37d105bad61a96b6ab2aa50fa419c1e0a2f58f3b846834634f11701eb8f00111 SHA512 52fb5f3b71404c6e04102f22d1250e8c1484400b03e523aa0c7e6b9d73d03f690ddf55bb1a7ec4c61d8b731e901fc4ac8162b3a41d32317615753a8843e64897 WHIRLPOOL 2beba5d03981112f7130012105e052dc94a9cb7ff208e97549e767b4835f33f9d840340fb7b5a9e90c4126382d2822e933ec8ec4812669df296a065765fd3ab4
-MISC metadata.xml 1094 SHA256 271840e4016f655cc85c7627b659b98837092381a4c1fcc873f195cb04c74d26 SHA512 7b5605c0fdc9660e28b5b07824c22fe73889f3a2395e06ce82cae54fcc4f63b86d2bd43cfa9b68aa9b84306003c91b489b824242f0f38a39c6a78acb6756e7ca WHIRLPOOL 037bd3f7fe652097bce78f11e9c5fce9a5a16e328c20efc7e9e188df0bd8061342950d5cec2fd4f5e3dd79655692c8e4bf77d7f4333aa608e2d5f70639be968a
+EBUILD fityk-1.2.1.ebuild 2030 SHA256 9ae01dd100dada1b9fef0de51818afdfb86a86c007076dd6ba3dd91397eb0eda SHA512 85c75cb095f1c7871c7e666b6733022876827b2b27c3b10ae21e60f1cd5baa4ee5da366d1f43a30fb97d9b86c24bf1f8e5cbb455be8097a5fe4b8914753b0945 WHIRLPOOL e037faef368ddb1037bb87fda0cf8e9cbabce39873318fe452d0077a4337a2ff98c575af4ced67d3d29736f281e29c5cec28f8e40c667e838d2bea1ee96bd0cc
+MISC ChangeLog 3880 SHA256 9daa289816e9e828c6d95c7209ac5b479d5b74778424a84c9b09595f7363ec02 SHA512 0db688b18c07ead78ba6214871e239c1d264190bc9c6c167bee1384dddbf96047c6010d0eef42b7962b1588c325a7385f8828f38291580403a0231334d9375b2 WHIRLPOOL 606979d19dce7b16fe2cc956f5812124409fa5a1ffcf9f5476ce1dd7f5e4210a037268b221c9d971e0d7a5c6734d7bc74a472af38bd51a61b27a2fc37b1ac9f4
+MISC metadata.xml 1186 SHA256 4825708c2355abf4df2c0ce32b499626e0695763ffd32bc0232383eb1388b425 SHA512 2b0736546de50ca96ad08c7fabac438750284bb09edf31800427c3279196d190d61c96759e1fcdfa27cc9a5deda2320e7eccd6c35b24c3295c538cfe02dcdc42 WHIRLPOOL 5013c664135f9893a7313ddacad00c4534e3413d0f49db8c65ad02ee33aa0181ca5daf789e46ca21b0f3332e1f4966ba022d53747b39104afae60e3425e8a7c6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlAgVcUACgkQ1ycZbhPLE2AYvgCfXa/KXUbemQAu4OJ4ZCvg0hY9
-pMcAnR8hxeKTUOwB9X3gsgI0nwFt91M9
-=fNOP
+iEYEAREIAAYFAlGyYzEACgkQ1ycZbhPLE2BirgCfZn25vL55V/YO5lR2cq1FZF2Q
+lVoAn374Q1LYBpFh3KBw/ZB25N3s1B9c
+=IsWj
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/fityk/fityk-1.2.0.ebuild b/sci-visualization/fityk/fityk-1.2.0.ebuild
deleted file mode 100644
index 08c60886af50..000000000000
--- a/sci-visualization/fityk/fityk-1.2.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/fityk-1.2.0.ebuild,v 1.1 2012/08/06 23:39:41 bicatali Exp $
-
-EAPI=4
-
-WX_GTK_VER="2.9"
-
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-GITHUB_USER="wojdyr"
-
-inherit python wxwidgets autotools fdo-mime
-
-DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
-HOMEPAGE="http://fityk.nieto.pl/"
-SRC_URI="http://github.com/downloads/${GITHUB_USER}/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="gnuplot readline python static-libs wxwidgets"
-
-CDEPEND=">=sci-libs/xylib-0.8
-	>=dev-lang/lua-5.1
-	readline? ( sys-libs/readline )
-	wxwidgets? ( >=x11-libs/wxGTK-2.9.2 )"
-
-DEPEND="${CDEPEND}
-	dev-libs/boost
-	>=sys-devel/libtool-2.2"
-
-RDEPEND="${CDEPEND}
-	gnuplot? ( sci-visualization/gnuplot )"
-
-RESTRICT_PYTHON_ABIS="3.*"
-
-pkg_setup() {
-	use python && python_pkg_setup
-}
-
-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 ${PN}/Makefile.in
-	if use python; then
-		echo '#!/bin/sh' > build-aux/py-compile
-	fi
-}
-
-src_configure() {
-	econf  \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--disable-xyconvert \
-		$(use_enable python) \
-		$(use_enable static-libs static) \
-		$(use_enable wxwidgets GUI) \
-		$(use_with readline)
-}
-
-src_compile() {
-	default
-	use python && python_copy_sources ${PN}
-	if use python; then
-		compilation() {
-			emake \
-				PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
-				PYTHON_LDFLAGS="$(python_get_library -l)" \
-				PYTHON_SITE_PKG="${EPREFIX}$(python_get_sitedir)" \
-				PYTHON_VERSION="$(python_get_version)" \
-				pyexecdir="${EPREFIX}/$(python_get_sitedir)" \
-				swig/_fityk.la
-		}
-		python_execute_function -s --source-dir ${PN} compilation
-	fi
-}
-
-src_install() {
-	default
-	if use python; then
-		installation() {
-			emake \
-				DESTDIR="${D}" \
-				pyexecdir="${EPREFIX}/$(python_get_sitedir)" \
-				pythondir="${EPREFIX}/$(python_get_sitedir)" \
-				install-pyexecLTLIBRARIES
-		}
-		python_execute_function -s --source-dir ${PN} installation
-		python_clean_installation_image
-	fi
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize ${PN}.py
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup ${PN}.py
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-visualization/fityk/fityk-1.2.1.ebuild b/sci-visualization/fityk/fityk-1.2.1.ebuild
new file mode 100644
index 000000000000..53e10ab2a205
--- /dev/null
+++ b/sci-visualization/fityk/fityk-1.2.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/fityk-1.2.1.ebuild,v 1.1 2013/06/07 22:48:09 bicatali Exp $
+
+EAPI=5
+
+WX_GTK_VER="2.9"
+GITHUB_USER="wojdyr"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit autotools-utils fdo-mime python-r1 wxwidgets
+
+DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
+HOMEPAGE="http://fityk.nieto.pl/"
+SRC_URI="http://github.com/downloads/${GITHUB_USER}/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="gnuplot nlopt readline python static-libs wxwidgets"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+	>=sci-libs/xylib-1
+	>=dev-lang/lua-5.1
+	nlopt? ( sci-libs/nlopt )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline )
+	wxwidgets? ( >=x11-libs/wxGTK-2.9.2 )"
+DEPEND="${CDEPEND}
+	dev-libs/boost
+	dev-util/swig"
+RDEPEND="${CDEPEND}
+	gnuplot? ( sci-visualization/gnuplot )"
+
+src_configure() {
+	local myeconfargs=(
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--disable-xyconvert
+		--disable-python
+		$(use_enable nlopt)
+		$(use_enable wxwidgets GUI)
+		$(use_with readline)
+	)
+	autotools-utils_src_configure
+	if use python; then
+		myeconfargs=(
+		--disable-xyconvert
+		--enable-python
+		--disable-nlopt
+		--disable-GUI
+		--without-readline )
+		python_foreach_impl autotools-utils_src_configure
+	fi
+}
+
+src_compile() {
+	autotools-utils_src_compile
+	python_copy_sources
+	if use python; then
+		python_compilation() {
+			pushd ${BUILD_DIR}/fityk
+			einfo "in ${PWD}"
+			emake swig/_fityk.la
+			popd
+		}
+		python_foreach_impl python_compilation
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install
+	if use python; then
+		python_installation() {
+			pushd ${BUILD_DIR}/fityk
+			emake DESTDIR="${D}" install-pyexecLTLIBRARIES
+			popd
+		}
+		python_foreach_impl python_installation
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/sci-visualization/fityk/metadata.xml b/sci-visualization/fityk/metadata.xml
index d030370eb5f9..af80659b7891 100644
--- a/sci-visualization/fityk/metadata.xml
+++ b/sci-visualization/fityk/metadata.xml
@@ -21,4 +21,7 @@
   (eg. zero-shift of instrument), handling series of datasets,
   automation of common tasks with scripts, and more.
 </longdescription>
+<use>
+  <flag name="nlopt">Enable optimization with <pkg>sci-libs/nlopt</pkg></flag>
+</use>
 </pkgmetadata>