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

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

6 files changed, 109 insertions, 222 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/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>