Version bump, adds Odyssey 1.1 updates and new import/export features. Drop old.

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

3 files changed, 51 insertions, 6 deletions

diff --git a/games-util/pyfa/ChangeLog b/games-util/pyfa/ChangeLog
index 34e080ab1e86..2afde84560f6 100644
--- a/games-util/pyfa/ChangeLog
+++ b/games-util/pyfa/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-util/pyfa
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/ChangeLog,v 1.22 2013/07/30 08:16:50 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/ChangeLog,v 1.23 2013/09/04 04:59:30 tetromino Exp $
+
+*pyfa-1.1.16 (04 Sep 2013)
+
+  04 Sep 2013; Alexandre Rostovtsev <tetromino@gentoo.org> -pyfa-1.1.14.ebuild,
+  +pyfa-1.1.16.ebuild, +files/pyfa-1.1.16-wxversion.patch:
+  Version bump, adds Odyssey 1.1 updates and new import/export features. Drop
+  old.
 
   30 Jul 2013; Sergey Popov <pinkbyte@gentoo.org> pyfa-1.1.15.ebuild:
   Add ~arm keyword, wrt bug #478340
diff --git a/games-util/pyfa/files/pyfa-1.1.16-wxversion.patch b/games-util/pyfa/files/pyfa-1.1.16-wxversion.patch
new file mode 100644
index 000000000000..628aa1b486a5
--- /dev/null
+++ b/games-util/pyfa/files/pyfa-1.1.16-wxversion.patch
@@ -0,0 +1,38 @@
+From d21c0df4c21f808f31146e017839622af029751a Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 4 Sep 2013 00:13:35 -0400
+Subject: [PATCH] use wxversion.select(), not wxversion.ensureMinimal()
+
+If wxversion.ensureMininal('2.8') runs before wxversion.select('2.8') on
+a system that has wxPython 2.8 and 2.9 installed, 2.9 will be selected -
+and Pyfa is incompatible with 2.9.
+---
+ pyfa.py | 11 +++--------
+ 1 file changed, 3 insertions(+), 8 deletions(-)
+
+diff --git a/pyfa.py b/pyfa.py
+index 098b87b..2fc0500 100755
+--- a/pyfa.py
++++ b/pyfa.py
+@@ -29,15 +29,10 @@ if not hasattr(sys, 'frozen'):
+ 
+     try:
+         import wxversion
+-        wxversion.ensureMinimal('2.8')
+-    except ImportError:
+-        print "Cannot find wxPython or the installed wxPython version doesn't meet the min. requirements.\nYou can download wxPython (2.8) from http://www.wxpython.org/"
+-        sys.exit(1)
+-
+-    try:
+         wxversion.select('2.8')
+-    except wxversion.VersionError:
+-        print("Unable to select wxpython 2.8, attempting to continue anyway")
++    except:
++        print "Cannot find wxPython or the installed wxPython version doesn't meet the requirements.\nYou can download wxPython (2.8) from http://www.wxpython.org/"
++        sys.exit(1)
+ 
+     try:
+         import sqlalchemy
+-- 
+1.8.3.2
+
diff --git a/games-util/pyfa/pyfa-1.1.14.ebuild b/games-util/pyfa/pyfa-1.1.16.ebuild
index 6a9070db1a0f..ca977fe2e3c1 100644
--- a/games-util/pyfa/pyfa-1.1.14.ebuild
+++ b/games-util/pyfa/pyfa-1.1.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.14.ebuild,v 1.2 2013/07/20 03:09:03 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.16.ebuild,v 1.1 2013/09/04 04:59:30 tetromino Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -10,11 +10,11 @@ inherit eutils gnome2-utils python-r1
 
 DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
 HOMEPAGE="https://github.com/DarkFenX/Pyfa"
-SRC_URI="http://go-dl.eve-files.com/media/corp/Kadesh/${P}-odyssey-1.0-src.zip"
+SRC_URI="http://go-dl.eve-files.com/media/corp/Kadesh/${P}-odyssey-1.1-src.zip"
 
 LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+graph"
 
 RDEPEND="dev-python/sqlalchemy[${PYTHON_USEDEP}]
@@ -34,8 +34,8 @@ src_prepare() {
 	# make staticPath settable from configforced again
 	epatch "${FILESDIR}/${PN}-1.1-staticPath.patch"
 
-	# use correct slot of wxpython, http://trac.evefit.org/ticket/475
-	epatch "${FILESDIR}/${PN}-1.1.4-wxversion.patch"
+	# https://github.com/DarkFenX/Pyfa/pull/14
+	epatch "${FILESDIR}/${PN}-1.1.16-wxversion.patch"
 
 	# do not try to save exported html to python sitedir
 	epatch "${FILESDIR}/${PN}-1.1.8-html-export-path.patch"