Version bump, thanks Dominik Kriegner

(Portage version: 2.2.01.20796-prefix/cvs/Linux x86_64)

2 files changed, 35 insertions, 28 deletions

diff --git a/sci-visualization/fityk/ChangeLog b/sci-visualization/fityk/ChangeLog
index 1b8e3065123d..0492fdda2aa9 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.19 2012/04/25 03:15:56 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/ChangeLog,v 1.20 2012/08/06 23:39:41 bicatali Exp $
+
+*fityk-1.2.0 (06 Aug 2012)
+
+  06 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> +fityk-1.2.0.ebuild,
+  -fityk-0.9.7.ebuild:
+  Version bump, thanks Dominik Kriegner
 
 *fityk-0.9.8 (25 Apr 2012)
 
@@ -101,4 +107,3 @@
   +files/fityk-0.8.4-as-needed.patch, +metadata.xml, +fityk-0.8.4.ebuild:
   Initial import. Thanks Honza Macháček and Michelangelo Scopelliti for
   their work. Closing bug #126810.
-
diff --git a/sci-visualization/fityk/fityk-0.9.7.ebuild b/sci-visualization/fityk/fityk-1.2.0.ebuild
index 20aebcf7b5a5..08c60886af50 100644
--- a/sci-visualization/fityk/fityk-0.9.7.ebuild
+++ b/sci-visualization/fityk/fityk-1.2.0.ebuild
@@ -1,29 +1,30 @@
 # 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.7.ebuild,v 1.2 2012/04/23 17:29:33 mgorny Exp $
+# $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="3"
+EAPI=4
 
-WX_GTK_VER="2.8"
+WX_GTK_VER="2.9"
 
 PYTHON_DEPEND="python? 2"
 SUPPORT_PYTHON_ABIS="1"
+GITHUB_USER="wojdyr"
 
-inherit python wxwidgets
+inherit python wxwidgets autotools fdo-mime
 
 DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
 HOMEPAGE="http://fityk.nieto.pl/"
-SRC_URI="mirror://github/wojdyr/${PN}/${P}.tar.bz2"
+SRC_URI="http://github.com/downloads/${GITHUB_USER}/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples gnuplot lua readline python static-libs wxwidgets"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="gnuplot readline python static-libs wxwidgets"
 
 CDEPEND=">=sci-libs/xylib-0.8
-	lua? ( dev-lang/lua )
+	>=dev-lang/lua-5.1
 	readline? ( sys-libs/readline )
-	wxwidgets? ( x11-libs/wxGTK:2.8 )"
+	wxwidgets? ( >=x11-libs/wxGTK-2.9.2 )"
 
 DEPEND="${CDEPEND}
 	dev-libs/boost
@@ -34,15 +35,19 @@ RDEPEND="${CDEPEND}
 
 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 swig/Makefile.in
+		-i ${PN}/Makefile.in
 	if use python; then
-		echo '#!/bin/sh' > config/py-compile
+		echo '#!/bin/sh' > build-aux/py-compile
 	fi
 }
 
@@ -50,53 +55,50 @@ 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 examples samples) \
 		$(use_with readline)
 }
 
 src_compile() {
-	use python && python_copy_sources swig
 	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="$(python_get_sitedir)" \
+				PYTHON_SITE_PKG="${EPREFIX}$(python_get_sitedir)" \
 				PYTHON_VERSION="$(python_get_version)" \
-				pyexecdir="$(python_get_sitedir)" \
-				_fityk.la
+				pyexecdir="${EPREFIX}/$(python_get_sitedir)" \
+				swig/_fityk.la
 		}
-		python_execute_function -s --source-dir swig compilation
+		python_execute_function -s --source-dir ${PN} compilation
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
+	default
 	if use python; then
 		installation() {
 			emake \
 				DESTDIR="${D}" \
-				pyexecdir="$(python_get_sitedir)" \
-				pythondir="$(python_get_sitedir)" \
-				install
+				pyexecdir="${EPREFIX}/$(python_get_sitedir)" \
+				pythondir="${EPREFIX}/$(python_get_sitedir)" \
+				install-pyexecLTLIBRARIES
 		}
-		python_execute_function -s --source-dir swig installation
+		python_execute_function -s --source-dir ${PN} installation
 		python_clean_installation_image
 	fi
-	dodoc NEWS README TODO
 }
 
 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
 }