Bump, adds Inferno 1.1 updates and html export for viewing fits in the in-game browser. Drop old.

(Portage version: 2.2.0_alpha118/cvs/Linux x86_64)

3 files changed, 47 insertions, 3 deletions

diff --git a/games-util/pyfa/ChangeLog b/games-util/pyfa/ChangeLog
index a12ba76be71b..a0cc8fa9e5c8 100644
--- a/games-util/pyfa/ChangeLog
+++ b/games-util/pyfa/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-util/pyfa
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/ChangeLog,v 1.11 2012/05/24 09:43:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/ChangeLog,v 1.12 2012/07/16 10:04:47 tetromino Exp $
+
+*pyfa-1.1.8 (16 Jul 2012)
+
+  16 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org> -pyfa-1.1.6.ebuild,
+  +pyfa-1.1.8.ebuild, +files/pyfa-1.1.8-html-export-path.patch:
+  Bump, adds Inferno 1.1 updates and html export for viewing fits in the
+  in-game browser. Drop old.
 
 *pyfa-1.1.7 (24 May 2012)
 
diff --git a/games-util/pyfa/files/pyfa-1.1.8-html-export-path.patch b/games-util/pyfa/files/pyfa-1.1.8-html-export-path.patch
new file mode 100644
index 000000000000..e7614d21aa4d
--- /dev/null
+++ b/games-util/pyfa/files/pyfa-1.1.8-html-export-path.patch
@@ -0,0 +1,33 @@
+From 017938391c5b67327c489a5c3a6fc720d4204609 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 16 Jul 2012 05:43:38 -0400
+Subject: [PATCH] Export fits to home directory, not python sitedir
+
+---
+ service/settings.py |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/service/settings.py b/service/settings.py
+index 8f6e3a8..5ac386d 100644
+--- a/service/settings.py
++++ b/service/settings.py
+@@ -21,6 +21,7 @@ import cPickle
+ import os.path
+ import config
+ import urllib2
++import sys
+ 
+ class SettingsProvider():
+     BASE_PATH = os.path.join(config.savePath, "settings")
+@@ -199,7 +200,7 @@ class HTMLExportSettings():
+         return cls._instance    
+ 
+     def __init__(self):
+-        serviceHTMLExportDefaultSettings = {"enabled": False, "path": config.pyfaPath + os.sep + 'pyfaFits.html' }
++        serviceHTMLExportDefaultSettings = {"enabled": False, "path": unicode(os.path.expanduser(os.path.join('~', 'pyfaFits.html')), sys.getfilesystemencoding()) }
+         self.serviceHTMLExportSettings = SettingsProvider.getInstance().getSettings("pyfaServiceHTMLExportSettings", serviceHTMLExportDefaultSettings)
+     
+     def getEnabled(self):
+-- 
+1.7.8.6
+
diff --git a/games-util/pyfa/pyfa-1.1.6.ebuild b/games-util/pyfa/pyfa-1.1.8.ebuild
index 21583963c0da..51e8f7823c28 100644
--- a/games-util/pyfa/pyfa-1.1.6.ebuild
+++ b/games-util/pyfa/pyfa-1.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.6.ebuild,v 1.1 2012/05/02 05:12:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.8.ebuild,v 1.1 2012/07/16 10:04:47 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -9,7 +9,7 @@ PYTHON_USE_WITH="sqlite threads"
 inherit eutils gnome2-utils python
 
 if [[ ${PV/_rc*/} == ${PV} ]] ; then
-	MY_PV=${PV}-escalation-src
+	MY_PV=${PV}-inferno-src
 	FOLDER=stable/${PV}
 else
 	MY_PV=${PV/_rc/-stable-RC}-src
@@ -44,6 +44,10 @@ src_prepare() {
 	# use correct slot of wxpython, http://trac.evefit.org/ticket/475
 	epatch "${FILESDIR}/${PN}-1.1.4-wxversion.patch"
 
+	# do not try to save exported html to python sitedir
+	epatch "${FILESDIR}/${PN}-1.1.8-html-export-path.patch"
+
+	chmod 755 pyfa.py || die "chmod failed"
 	python_convert_shebangs -r -x 2 .
 	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
 		-e "s:%%EPREFIX%%:${EPREFIX}:" \