Version Bump, fixes https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/85; thanks Marius Brehler for the bump; clean old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

7 files changed, 131 insertions, 246 deletions

diff --git a/sci-visualization/fityk/ChangeLog b/sci-visualization/fityk/ChangeLog
index 2f9d8c59752f..2daecbc0408f 100644
--- a/sci-visualization/fityk/ChangeLog
+++ b/sci-visualization/fityk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-visualization/fityk
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/ChangeLog,v 1.24 2015/04/08 18:23:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/ChangeLog,v 1.25 2015/04/12 16:25:37 jlec Exp $
+
+*fityk-1.2.9 (12 Apr 2015)
+
+  12 Apr 2015; Justin Lecher <jlec@gentoo.org> +fityk-1.2.9.ebuild,
+  -fityk-0.9.8.ebuild, -fityk-1.1.1.ebuild, fityk-1.2.1.ebuild, metadata.xml:
+  Version Bump, fixes https://github.com/gentoo/gentoo-portage-rsync-
+  mirror/pull/85; thanks Marius Brehler for the bump; clean old
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> fityk-1.2.1.ebuild:
   Drop old Python implementations
diff --git a/sci-visualization/fityk/Manifest b/sci-visualization/fityk/Manifest
index defa1419298e..8d4db554d341 100644
--- a/sci-visualization/fityk/Manifest
+++ b/sci-visualization/fityk/Manifest
@@ -1,30 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-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.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.1.ebuild 2032 SHA256 3d1ea0176a08748be65a5c8fea291f9e91ae7ddd9881a34141424498785af39f SHA512 81c24c5ff160a4d53336aef0b3e365816f0fd8865b56df373f9860321325a64f131201909b8b85661e970980e278d667d11b50ef65a7d440b52b7ea0cd30741d WHIRLPOOL 06bddccdaf6da1266303f6e4f7f7b232d63e5f4b0a0e53c0f89ffd68a42f5dbeead06923c92a43d3db4d393778573230af6624ff88ae3ea43f712a18c460a8a3
-MISC ChangeLog 4176 SHA256 594f1adaa6b9512f2030489cc5b5ad1b14edd46d8ff9ddb742dc54b72df508e9 SHA512 e0371c9f16fb5be7766c1285f0c4411f2f92cf05d821dcaa4c7a10894b90ee46eeb837762900cfcc5d0c0fe35625afcb5855443875dd1fe94ea323ca8256a6e0 WHIRLPOOL 11abcea6224eb99f00a0d26504d947269f3cee7abd08793bdbba5fdcb12333ab5eb95c64e0f15875bf1fb67469904eda140a0a0deebda4379750688ebd0ec9f9
-MISC metadata.xml 1186 SHA256 4825708c2355abf4df2c0ce32b499626e0695763ffd32bc0232383eb1388b425 SHA512 2b0736546de50ca96ad08c7fabac438750284bb09edf31800427c3279196d190d61c96759e1fcdfa27cc9a5deda2320e7eccd6c35b24c3295c538cfe02dcdc42 WHIRLPOOL 5013c664135f9893a7313ddacad00c4534e3413d0f49db8c65ad02ee33aa0181ca5daf789e46ca21b0f3332e1f4966ba022d53747b39104afae60e3425e8a7c6
+DIST fityk-1.2.9.tar.bz2 1370476 SHA256 615f30296e6e6ed0cad3dfe4fd139b552c25437d6afd371652de4bd12c1a89be SHA512 e6d4846a0690ea5e7b94fc067de48d67d6342ff595844d709af9f3b978bf4bd9d0095ce348716fd0053c5575b4bff5825f8f126a53bf7e11f4e6e8a2cc6ddb1a WHIRLPOOL 5f60429565d8a301bcec11be660df9c8cd69b03a94375de14215e74f56b8a878038bb0b9e81658ad5ac4fecd5ff7d127cb6ba992e19a98a21ad49941d42247a5
+EBUILD fityk-1.2.1.ebuild 2035 SHA256 9d01a1a88b82a275d08bee2fe001da7c2735b59aab6aff4d533c2047ff524fe6 SHA512 1d3bf333aef86c05a847c47026d79c585aa2ac077556f26f7653860c7755b108f98401719b54b782d21d66e795362d6ec35ef1ced86ae4526a6df71d009ecf25 WHIRLPOOL 21d8ce3a63436c1cc15089b39106d70cd3e1d0e2678587b99b9b51f0fb4c6a6cbdad6199114c8208b392a1822144508e71d019f1d8b3a7b3d217ebc155c5b023
+EBUILD fityk-1.2.9.ebuild 2131 SHA256 5d15839666c023547480dfc937c1743def101919ce1ab741c31f1f8b437e6476 SHA512 e9bfad58f7cdab5a499c1a05bed2efd1f508c5900a525ea30eaea4ed010f9b905eb41e12f75cdbf0c9ca3f71ec610d736da26b2e395b5aff17c9ac916401420b WHIRLPOOL 255018539bf8a2b0a38142a872a29e841942eaf90064f2b83a21e0a1608337ff091612f6370dd319d6ca95875dca09445821f3548a9908f563f6e1dfc36d7034
+MISC ChangeLog 4483 SHA256 8571923fe195bc83c858dbdf1db010c7420d7940950e3cf2c4e608fbda67084c SHA512 62647bc888c79a2ab986cfd560548c1dfc8b4af8bc27b0ea92c8e76676df0201c90e3db0caccccf16cf880109a9a367c7c9e4594c934d6f7f356e1b39b96ff48 WHIRLPOOL 317ba37cc89d32c43bdce719cfd1567f7cb66e7b81cd8a831af7cfdff9fd679d93d4d4f3264bfc9b893b322a6902c38b81a91e0e2526321300923fe6687dfded
+MISC metadata.xml 1196 SHA256 4fd7bbdbe5dce56d40418b19e8f81cbea378de17b78dc4ffa601b7a14eee356a SHA512 71f80b3fc4397e44abd4efca55fd507ae19f96f0881263414b031ae6c9340e839bf413ca01880ea68280ff3d3dee1054701f7b55ec174805767977b01a8d221a WHIRLPOOL 4a853acb0fdd114596d675a7ed489cd3c435cbcaac837f3c03e3f2ef7a076a99e8d4d0052de77f0d8128713efe1bc8b3e00c07656af187c85df020c366aa8b28
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJXJGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOSY0QAMhbiJDozzPfoLq9uUczdwBn
-7ps+rmpvIvsSd29Y4zTn+bihM8d/R714NZmXikLn0Fa8QrZ2Jj6ZpHVRjCaC2F+3
-5EFgGsL3Ayz5/8uwoB00LUixbjqIBD1tsLOEXbfSGIKnZ3ikXgDUci1X8pdvfw4Q
-4M4aB5+ckG2Ss/7FoLEqY+3qdLmZ0IwKgLQ3l/6FiwIanAXEzRE5E+RAv4SoVwXp
-jeX/Dyh6mD2lXMLqQh1L+rZm/fKcpJxXa3h6chxBP6K+j25HvXuFMAguaXqFTlGZ
-8GOghZREP+eGASslSG1eBmwjujTnWBu7tFrDXdMb+85CDWQJI5RximLUNG5yCHTy
-PWx3EM/ky0fqkhzrbLTK/FE32H+mwsrQQ10D0o0sB6aPI16mXNQC58B9QthXOp+a
-M5slrNiujGcc8QtfnZ6SHvk2XzM2/6kqSaMerjtHW/el1Kkn3ft23E+wrs64TKmG
-Kusc++Ph4fkAjNAnzHQR/RKvfLY+F6gOiTEMVzHQGfD4G3MroEjwJ6wq0NDkj3NI
-T2LA9fRqKORYm/pO6vBgetunl+oflykQhh8WNqsFNCtobytPEN0J+p5UERr8ij7q
-5NYm88bMwiEvx1Z2TkzyKabuarmWdAN2hR5fkkQCWAr5fuGm4/0Y8h0cizfFrqt7
-S+96MS9f8tyQQHYL6Mt7
-=gI4n
+iQJ8BAEBCgBmBQJVKpyUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirBz0P+QEQiKV+Q0W8XyPdOgLZgHch
+QDqtV+pQpE+qXZ4wkWyfIfRfSySPLQTT2ZrcPE+6RY0//X4rg9ogfcR/j5j8/mKL
+JrujYOeq+1GX1kWQN2rGB4y8jittcRMJR1MG6T8T1GLpNQiVqCz/2XCaiJAWzO9P
+HxUaTB+6dHeSCRfOWk2lHVoRnlMQPlSFkcS8PfXl078gZpqw09nW96wLXfnbg3QA
+NT9VSR+RSqOuzIg08rkdTZPUnVJgKWIX9ZpOs8vVvsWMEORt6LwFAZ7eOtQ5aKQG
+qNaBxTMpXmyDvmLBBxDiWjgUmbMDHEZzMRM0mEZfWwdVymKQIfYh8J2Aj3Q1G7x7
+Klp2fYAFeypqluucLXaQKcyEI0KFMxXklNCVLI+1dMB9Q9y7OmmuWmKu4j4t0WGC
+TNufK1MF83NIqopr3toTT2OQcclVatCVmDAFrvgizL3kF7BmC/D1qdK5Buh3CTEW
+QB1t28SAU/cAQ0Lgbs33Grv6382SMi79PWGtg/CqVO/ieAn82IJVq+Vxca17oGcG
+StnbG1dE4xQnjGTJBPvE9QbEMH5nufqikp+y4kJ5oYHpaKCKLCd3tLXHt/zDQ2RE
+Lq7Cg83wqHWCHKDQZPAxZw8qZ8OR78cLfLwslpKfpsA6/XOds7HPPDvDx5HRnhzD
+38uFMmPRKZv/ECZqd+2h
+=e48j
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/fityk/fityk-0.9.8.ebuild b/sci-visualization/fityk/fityk-0.9.8.ebuild
deleted file mode 100644
index 9f7099b1c7b0..000000000000
--- a/sci-visualization/fityk/fityk-0.9.8.ebuild
+++ /dev/null
@@ -1,105 +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-0.9.8.ebuild,v 1.1 2012/04/25 03:15:56 bicatali Exp $
-
-EAPI=4
-
-WX_GTK_VER="2.8"
-
-# python eclass cruft
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit python wxwidgets
-
-DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
-HOMEPAGE="http://fityk.nieto.pl/"
-SRC_URI="mirror://github/wojdyr/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples gnuplot lua readline python static-libs wxwidgets"
-
-CDEPEND=">=sci-libs/xylib-0.8
-	lua? ( dev-lang/lua )
-	readline? ( sys-libs/readline )
-	wxwidgets? ( x11-libs/wxGTK:2.8[X] )"
-
-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' \
-		src/optional_suffix.h
-
-	sed -i \
-		-e '/^LTLIBRARIES/s:$(pyexec_LTLIBRARIES)::g' \
-		-e '/install-exec-am/s:install-pyexecLTLIBRARIES::' \
-		swig/Makefile.in || die
-	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 static-libs static) \
-		$(use_enable wxwidgets GUI) \
-		$(use_with doc) \
-		$(use_with readline)
-}
-
-src_compile() {
-	use python && python_copy_sources swig
-	default
-	if use python; then
-		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() {
-	default
-	if use python; then
-		installation() {
-			emake \
-				DESTDIR="${D}" \
-				pyexecdir="$(python_get_sitedir)" \
-				pythondir="$(python_get_sitedir)" \
-				install install-pyexecLTLIBRARIES
-		}
-		python_execute_function -s --source-dir swig installation
-		python_clean_installation_image
-	fi
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins samples/*
-	fi
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize ${PN}.py
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup ${PN}.py
-}
diff --git a/sci-visualization/fityk/fityk-1.1.1.ebuild b/sci-visualization/fityk/fityk-1.1.1.ebuild
deleted file mode 100644
index bebf541ea8f7..000000000000
--- a/sci-visualization/fityk/fityk-1.1.1.ebuild
+++ /dev/null
@@ -1,108 +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.1.1.ebuild,v 1.1 2012/02/27 06:07:42 bicatali Exp $
-
-EAPI="4"
-
-WX_GTK_VER="2.9"
-
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-GITHUB_USER="wojdyr"
-GITTAG="772ddee"
-S="${WORKDIR}/${GITHUB_USER}-${PN}-${GITTAG}"
-
-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/${GITHUB_USER}/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gnuplot readline python static-libs wxwidgets"
-
-CDEPEND=">=sci-libs/xylib-0.8
-	dev-lang/lua
-	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() {
-	eautoreconf
-	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 python) \
-		$(use_enable static-libs static) \
-		$(use_enable wxwidgets GUI) \
-		$(use_with doc) \
-		$(use_with readline)
-}
-
-src_compile() {
-	use python && python_copy_sources swig
-	default
-	if use python; then
-		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() {
-	default
-	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
-}
-
-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
index a9e3ca176b80..c4b36c8ae39c 100644
--- a/sci-visualization/fityk/fityk-1.2.1.ebuild
+++ b/sci-visualization/fityk/fityk-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.4 2015/04/08 18:23:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/fityk-1.2.1.ebuild,v 1.5 2015/04/12 16:25:37 jlec Exp $
 
 EAPI=5
 
@@ -23,10 +23,10 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 CDEPEND="
 	>=sci-libs/xylib-1
-	>=dev-lang/lua-5.1
+	>=dev-lang/lua-5.1:0
 	nlopt? ( sci-libs/nlopt )
 	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline )
+	readline? ( sys-libs/readline:0= )
 	wxwidgets? ( >=x11-libs/wxGTK-2.9.2:2.9 )"
 DEPEND="${CDEPEND}
 	dev-libs/boost
diff --git a/sci-visualization/fityk/fityk-1.2.9.ebuild b/sci-visualization/fityk/fityk-1.2.9.ebuild
new file mode 100644
index 000000000000..4f1d56fdec27
--- /dev/null
+++ b/sci-visualization/fityk/fityk-1.2.9.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/fityk-1.2.9.ebuild,v 1.1 2015/04/12 16:25:37 jlec Exp $
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit autotools-utils fdo-mime python-r1 wxwidgets
+
+DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
+HOMEPAGE="http://fityk.nieto.pl/"
+SRC_URI="https://github.com/wojdyr/${PN}/releases/download/v${PV}/${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:0
+	nlopt? ( sci-libs/nlopt )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:* )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )"
+DEPEND="${CDEPEND}
+	dev-libs/boost
+	dev-lang/swig"
+RDEPEND="${CDEPEND}
+	gnuplot? ( sci-visualization/gnuplot )"
+
+src_prepare() {
+	use python && python_copy_sources
+	autotools-utils_src_prepare
+}
+
+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
+	if use python; then
+		python_compilation() {
+			cd  "${BUILD_DIR}"/fityk || die
+			einfo "in ${PWD}"
+			emake swig/_fityk.la
+		}
+		python_foreach_impl python_compilation
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install
+	if use python; then
+		python_installation() {
+			cd  "${BUILD_DIR}"/fityk || die
+			emake DESTDIR="${D}" install-pyexecLTLIBRARIES
+			rm "${D}"/$(python_get_sitedir)/*.la || die
+		}
+		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 af80659b7891..f7bf05a87112 100644
--- a/sci-visualization/fityk/metadata.xml
+++ b/sci-visualization/fityk/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
   Fityk is a program for nonlinear fitting of analytical functions
   (especially peak-shaped) to data. It can also be used to display
   data or to remove baseline from data.
@@ -21,7 +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>
+  <use>
+    <flag name="nlopt">Enable optimization with <pkg>sci-libs/nlopt</pkg></flag>
+  </use>
 </pkgmetadata>