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

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

6 files changed, 44 insertions, 108 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/Manifest b/games-util/pyfa/Manifest
index 033bc77e6de0..52406a99bef6 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -4,24 +4,21 @@ Hash: SHA256
 AUX configforced.py 144 SHA256 289eaf04b78739937b6d4e0c144136a9c8174d59a98304cb52dbcae6a28dda66 SHA512 493f302102bd7d25b7824b76b5e6fd89b649b9a60693d44eb4113f6ecc7a0a7420b98e29eea7873a806aa6a4bd1c4e6f2e8e4153fd68f1523e8559d462887d04 WHIRLPOOL 57c4a4b63f7e54ba4ba1074d75bacf491385281dee596fe33187c49d58c65fe87deb84a8cc66823c9bf4958aadda16e47cdc2d0b84a5e9d2dce3f77bafe057a5
 AUX pyfa-1.1-staticPath.patch 979 SHA256 2efdd1a18271f919553c03e37e3552805e18cd6dee4fd0fc310bb315f3616d92 SHA512 dde8a0ba750281d25f4202c40db0e1fac74fa3726acb6b40dcc54783c8f987aa4bc4d5d4c09047a79d718baed395baa9a955f0bc8906ec8e4340379f3a53e470 WHIRLPOOL dc36b0f86c8ba1425a26c96e1c37494710915b86ca8c9ddb25a1d8341c7a54bf8d2a249bc685fbde857b50bc2d64b32643b2577028afa54af5031938d00e88f8
 AUX pyfa-1.1.11-import-pyfa.patch 880 SHA256 7a261bf8cb09845ec93f756437603abb1321b373b80d28ead53a78c32f017c3f SHA512 1c7b68adfde2bb6a7237a7188ddd6c440462c873c1f74177ae2b5784a8a48b5682f2ef033fc243cfdfad9b36205a26f8673d894cac225843ab140cae9090eee0 WHIRLPOOL ab18121b4e33c6bbd6e61c8d59324dac3cae055cc7a9e8d7275beec7240b2754d1bf4565b917537f9925e40154f9a37b069982bd67bf26b285641db92d82a8e7
-AUX pyfa-1.1.16-wxversion.patch 1338 SHA256 4a2b55222e5bd2a2f171467232a07252e9811003086ea8a5468f6636122d04e4 SHA512 31c1ad3cd2109aeca7d5fd0c2ac2cd19f95f84c6bae92ede38115e4943b821ffb02c09e2302567136c2b860495e03538141ba0016e082b04eb0d0669db1af87f WHIRLPOOL 58ccae8acc392ea9053cad595616a05208357186b5e3fd07e30ff2015f7314ff794fe4d9c3018da83243e8da065e5cfa500bde09b5fcccf8b85a515a4dff5282
-AUX pyfa-1.1.4-wxversion.patch 1290 SHA256 5bcd443238fa6b9c02861e7c16c2f2c9b297aee9400c6ebd4844280252e06dce SHA512 41e96083dff1c649fd1a22f7ac39e2a6347cc1bda81ff5f46d9e071c5dee21581e259a84bbea04eb70086ee8c7c8dbee20c444ce63d1b2579e1dae24d6273b75 WHIRLPOOL 8da546c4d7dbad6243bf875a719903bcb9cd126f8ed886b3f96904458eb4894ef0115b355d9201bd2f2e4b194ee928c9e48084d85fc7b645b3b10ec37814f29b
 AUX pyfa-1.1.8-html-export-path.patch 1219 SHA256 dfe776e75631750d3e18eba2d835359ba32d77ef8bec3db0fa74fd762dc3a7b6 SHA512 d60ce241af9228d18cccd74b2c6fbf81e40c17c4a396f4771c1ab44aa84b5fdb29fc859f1b5e7d9b097f3fc38e409e6f20593c73d674ea923e5564faa4f4cd45 WHIRLPOOL 8be74bf7f6224856279a21df2949856e98f2c2c1c9e358fa9518fc67b06693f350b96d8efe8e8f46e992e0983fa8a1ca775f9c9696e0e6c419a9c35caa9bf8b4
 AUX pyfa.desktop 155 SHA256 c395891d87eaaac64e3ba7954d623efaf161d906527099ed4b0c680c63a041eb SHA512 d62a44e4e724057581a360cc1eb10aa4c7a0c50cb1d95137e58ba14db17644c852da2582be8d508c50b7359e7f99dc893d78d15cb11c46967a9b7896ff667781 WHIRLPOOL 3f68f0cd6942380fc040a3578b054ea7cdb86fbd751ed17aa1fe1e1eda3c7ee6c35645c28c6529605856d5e74765ccd7037abe96c3efe2a5a54cc7fcb6c53793
-DIST pyfa-1.1.15-odyssey-1.0-src.zip 5915271 SHA256 338a8084598740963a03cb8ff85bfdc6fbbd95544fef26996b8189afd0e5af04 SHA512 f5b967c8f15d938ca4943ee2a7f2a1a291c21cb9cae34b8dbf8713982eef2626301f4719e5e01a3031546573c7ce52383bd3ab6f043cb7e0c3d0e10bf0796696 WHIRLPOOL a674a8de5c8ce88221442afcdd8998494938369a2af527a31ef85e46c67fbfee1341952035f407d532518e88ab9f9f21c25136ca84bbefc9f4c185f90d4408ee
-DIST pyfa-1.1.16-odyssey-1.1-src.zip 5992437 SHA256 45caa046afc2eb9dc5a296a770de099b29bdd480e74e7cda5a83fca2355b9310 SHA512 932816620ae3f80ad6b056ffd210db4538771d76e1bc99e7b07ce648d27b7d70df3626a3154389cfa39d359bdb29b55906f31fce762fb5afac4cd5360f46c586 WHIRLPOOL 6ccfe84b47317edc1f683fdfd46de8e16eb514f9069b52926dfc99d89a506866995cf09d8a647a41332394a9209d6f80f24c88b3d4f687cfde459bdde380a3c9
-EBUILD pyfa-1.1.15.ebuild 2549 SHA256 c2264635a2a2937a110ce028f8a7f497712b63892d6c6603540941bc73931c28 SHA512 ec3486fb0d2fd97b8bd6ea8dd7202dc5d7ba695b4737e388f22bc8e45292a98e1ab02f915c44ada170167f007f29d78251d64d74a8c52451929c3058fe102e99 WHIRLPOOL 1343a07a13656754879654fbe637838b6ce3510ac825d3a3540736ab2c992125d9a39b8a3433b885ae1fca370ab7afa959166e168259a48a9d8a2608c2fa8726
-EBUILD pyfa-1.1.16.ebuild 2528 SHA256 af3a1970d9fa33692a188643684846b2caedafade46ea5d40977d9670e4ae085 SHA512 e453cff692a00c34e3093dadc45aa6adb266369351af5bb07b33a8c32b2fa7d5c81ea10582871e8bb8d5eba1f3c20aac90d13ef35afb09b75c25d4bb577b296e WHIRLPOOL 58de846acb40dcd46f8be0f6cc288e0fce693c04f50eec36d0f334d79724ddb2d235475ae6f8aa4b4db395a3d492cfcaa977e341d29da36207a6aa849cb10796
-MISC ChangeLog 4980 SHA256 df6345c7c4e6c51132250a0adf67da95f984ac4e5162df88d015c20c19352858 SHA512 8ca1e512987d686ce998108f9f2f05522736d8eaa6f7aaf0ce0c36eae1e7fb8efe51a2e38e5242972f935611af259804a03199022add8d3e66d3242a31b6e6a5 WHIRLPOOL a93784e3310d0e11858b36db2d8f6ddd1246ab4df608713d54c919fb1e433a519cb8595fa427646c920cf8903439f95226fa028c1211b152c21bf072de87518c
+DIST pyfa-1.1.18-rubicon-1.0-src.zip 6048280 SHA256 6086e8d8ad6ddd539b04339e7df765f31e3134a8883ebc0315a37a420a5ad902 SHA512 d2932f0c3a24d4b89574d7890559fca244121bdd57404813465ebd6703266ef919aa7f7f937cbb8fd3d6d28087abfd3adad7e727a3c19025c89a21adb99942c9 WHIRLPOOL b2984fe03636f5f44ef2da11e1ff3c2d3f5d10d5eff78b397d90a5c4498d2af87eec87a509a2243b7f222ed9f18866fc781eac7eed55ed54def9623a79885ee2
+EBUILD pyfa-1.1.18.ebuild 2616 SHA256 490d93aacedaa8fcf6a6a60aa0b76d197f66d61b3d4a016953605da9460c00ae SHA512 ad707d2825356aa8029646e9a53bfb0f349415aa15d191437b5b4ab151ce915c32d65f5a55eb4f84758697d62f22d238b3ec47560adde098784d0b01ae01b607 WHIRLPOOL 72fb113dba11ca3d819f3a695792780ab39d11a55a7e4881d77efb82806099052e0b8f73eb26b5864b35d1fdefc17186739bc9fbc7a91c4dd2d34f39f8d0f8e9
+EBUILD pyfa-9999.ebuild 2614 SHA256 75e7e7660f6a141b5f126e6c3975a1692e05b36f77c50b0deef8850a53034724 SHA512 b049aef8de175f9af0e62b88b5efb05d5dc4ea3280c872f995d1bd030fc1e364573ae80ca42c3a2da3732154d54bba9726b88d3276328fef01da968865b140f4 WHIRLPOOL e7c3af0bf66ee91e4e9a44351b6752ae0cc768b47c1c9e95f9bdf035303e85990d7f0ecacc096e26d7ee678e75111dcaaaf6d6537ad130d674b57c54ed731e63
+MISC ChangeLog 5351 SHA256 b057ee049e140daaf26b2a256b299c3c09b7e71c44b3f313adfb5b40d01683f4 SHA512 4dd0aff7240a3066c5f4fe0b9ad00586e8c7a96bd62731948cb3789e8551666f0d3f3fe5c1c1d8df911e39168e093434bce8927e9096277dcbfda0736baad741 WHIRLPOOL f83fc0eeffefa5f411e3c74032aad3cad5863934dc41e0dc4f2abe5e8e3c82879d93dad57410e6186b8d1f7c1a872e9c3dab1df3dd55e22b3e536a050037e65b
 MISC metadata.xml 595 SHA256 d156a4f7b850289a6d11948ef082c26cd67040d98bce8a9b7ac8ce6ec14c9eec SHA512 e1452ad7b29d102e5522de9fea0a47a239c04b21315a2d53ccc6bfc9fc92fde6968a48e95999c79ae464029a551f7d38a19b355b04129550e762f0ff1be33fa0 WHIRLPOOL 76db6e34117e8051e658ced61c1dc0c00b9ce8983f5fbc2fd198224f8101687222ecc934bac555cee5ce8f27dda1ff3f469dacd89ad91fe7125903fc7413f960
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSJr42AAoJEJ0WA1zPCt1hxcEH/jN2lhXRIWrryn2EE29zwslB
-XZJ9asqs27QMsCTrtpEgJXk4NaujDnUXd6DCWpWtAzMAmJshrch0p/wGXWgvipqJ
-uy0PDC9Li4ly1kSQS697ndXl8VyBlv0A9OBJ43fB8yFVFzSeJlsMuuneyuomZ4wN
-+axSZyuX/9AzGrkdcqnRqUSgQUlmt9Sm42KHC9qCyfoltRV8PFSDhfpJzXWKV+lK
-EeHI22zuslSICjskKAFXSq6fAWr4y5sdb+H1M02e/6tLy5wUgqZRSuy5GelPqPYR
-vjiFQF5dYKC9it8Lq+H0KFLuJF5Jo721/lkvttF6+iP//unt8WvxGsVAZFV5dl8=
-=3nM9
+iQEcBAEBCAAGBQJSm+vjAAoJEJ0WA1zPCt1hWUgH/3LKXCrrdzZ90QUqdYma9uOl
+m0deo5jtSOfn97jmw6vON8cwHGrKeof2IIYDIoMbY9pa6vEi7hqFN3gpW0R4AUu4
+iBxWud/m85AbnXdbYhdFS0l7kCB1MKM3w/01TrlmiIJZSzVSIlBaIryJ5liHFlvh
+VHkclX7yRcm1jVQxdDzEOSvFGLATuX/SrNrmLsUxrejztfqC9iOg0FClBSZbVHyX
+N5XRSxPXZNxypOHCy/slvqhFxw+zpQvr6C7bML1RZjErcxwAt2lliTxIrhKMigju
+zR/WVV4aUHzQ8taitXw5HFKo+JVbqB2aEBD5/1uwXvt4+2fynWvNUh1XxeeL4Ak=
+=Rio2
 -----END PGP SIGNATURE-----
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