Version bump for Rubicon (bug #492396, thanks to Denis Misiurca). Add live git ebuild. Drop old.

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

5 files changed, 32 insertions, 93 deletions

diff --git a/games-util/pyfa/ChangeLog b/games-util/pyfa/ChangeLog
index 2afde84560f6..f5e18bfacd36 100644
--- a/games-util/pyfa/ChangeLog
+++ b/games-util/pyfa/ChangeLog
@@ -1,6 +1,15 @@
 # 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.23 2013/09/04 04:59:30 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/ChangeLog,v 1.24 2013/12/02 02:09:29 tetromino Exp $
+
+*pyfa-9999 (02 Dec 2013)
+*pyfa-1.1.18 (02 Dec 2013)
+
+  02 Dec 2013; Alexandre Rostovtsev <tetromino@gentoo.org> -pyfa-1.1.15.ebuild,
+  -pyfa-1.1.16.ebuild, +pyfa-1.1.18.ebuild, +pyfa-9999.ebuild,
+  -files/pyfa-1.1.4-wxversion.patch, -files/pyfa-1.1.16-wxversion.patch:
+  Version bump for Rubicon (bug #492396, thanks to Denis Misiurca). Add live
+  git ebuild. Drop old.
 
 *pyfa-1.1.16 (04 Sep 2013)
 
diff --git a/games-util/pyfa/files/pyfa-1.1.16-wxversion.patch b/games-util/pyfa/files/pyfa-1.1.16-wxversion.patch
deleted file mode 100644
index 628aa1b486a5..000000000000
--- a/games-util/pyfa/files/pyfa-1.1.16-wxversion.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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/files/pyfa-1.1.4-wxversion.patch b/games-util/pyfa/files/pyfa-1.1.4-wxversion.patch
deleted file mode 100644
index 624068b2bc9d..000000000000
--- a/games-util/pyfa/files/pyfa-1.1.4-wxversion.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 6971971729dbbea1db8c1006c99b1035f30214a2 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 21 Mar 2012 18:24:26 -0400
-Subject: [PATCH] Use wxversion.select('2.8') to support systems that have
- wxpython-2.9 installed
-
-Pyfa-1.x supports only wxpython-2.8, but multiple wxpython versions can
-be installed in parallel, and by default, 'import wx' pulls in the
-latest one.
-
-To support systems that have both wxpython-2.8 and 2.9 installed, pyfa
-needs to call wxversion.select.
-
-Note that wxversion.select can potentially fail with several exceptions
-internal to the wxversion module, so for simplicity, just check for all
-of them with an 'except:'.
-
-http://trac.evefit.org/ticket/475
----
- pyfa.py |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pyfa.py b/pyfa.py
-index aedb718..6992aaf 100755
---- a/pyfa.py
-+++ b/pyfa.py
-@@ -29,8 +29,8 @@ if not hasattr(sys, 'frozen'):
- 
-     try:
-         import wxversion
--        wxversion.ensureMinimal('2.8')
--    except ImportError:
-+        wxversion.select('2.8')
-+    except:
-         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)
- 
--- 
-1.7.8.5
-
diff --git a/games-util/pyfa/pyfa-1.1.16.ebuild b/games-util/pyfa/pyfa-1.1.18.ebuild
index ca977fe2e3c1..06138bee1020 100644
--- a/games-util/pyfa/pyfa-1.1.16.ebuild
+++ b/games-util/pyfa/pyfa-1.1.18.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.16.ebuild,v 1.1 2013/09/04 04:59:30 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.18.ebuild,v 1.1 2013/12/02 02:09:29 tetromino Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -10,11 +10,17 @@ 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.1-src.zip"
 
 LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/DarkFenX/Pyfa.git"
+	inherit git-2
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/DarkFenX/Pyfa/releases/download/v${PV}/${P}-rubicon-1.0-src.zip"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
 IUSE="+graph"
 
 RDEPEND="dev-python/sqlalchemy[${PYTHON_USEDEP}]
@@ -34,9 +40,6 @@ src_prepare() {
 	# make staticPath settable from configforced again
 	epatch "${FILESDIR}/${PN}-1.1-staticPath.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"
 
@@ -59,7 +62,8 @@ src_install() {
 	pyfa_py_install() {
 		local packagedir=$(python_get_sitedir)/${PN}
 		insinto "${packagedir}"
-		doins -r eos gui icons service config*.py info.py __init__.py gpl.txt
+		doins -r eos gui icons service config*.py __init__.py gpl.txt
+		[[ -e info.py ]] && doins info.py # only in zip releases
 		doins "${BUILD_DIR}/configforced.py"
 		python_doscript "${BUILD_DIR}/pyfa"
 		python_optimize
diff --git a/games-util/pyfa/pyfa-1.1.15.ebuild b/games-util/pyfa/pyfa-9999.ebuild
index aea9d94c0ca1..a41a75142da0 100644
--- a/games-util/pyfa/pyfa-1.1.15.ebuild
+++ b/games-util/pyfa/pyfa-9999.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.15.ebuild,v 1.2 2013/07/30 08:16:50 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-9999.ebuild,v 1.1 2013/12/02 02:09:29 tetromino Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -10,11 +10,17 @@ 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"
 
 LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/DarkFenX/Pyfa.git"
+	inherit git-2
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/DarkFenX/Pyfa/releases/download/v${PV}/${P}-rubicon-1.0-src.zip"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
 IUSE="+graph"
 
 RDEPEND="dev-python/sqlalchemy[${PYTHON_USEDEP}]
@@ -34,9 +40,6 @@ 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"
-
 	# do not try to save exported html to python sitedir
 	epatch "${FILESDIR}/${PN}-1.1.8-html-export-path.patch"
 
@@ -59,7 +62,8 @@ src_install() {
 	pyfa_py_install() {
 		local packagedir=$(python_get_sitedir)/${PN}
 		insinto "${packagedir}"
-		doins -r eos gui icons service config*.py info.py __init__.py gpl.txt
+		doins -r eos gui icons service config*.py __init__.py gpl.txt
+		[[ -e info.py ]] && doins info.py # only in zip releases
 		doins "${BUILD_DIR}/configforced.py"
 		python_doscript "${BUILD_DIR}/pyfa"
 		python_optimize