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

Package-Manager: portage-2.2.0_alpha118/cvs/Linux x86_64

4 files changed, 66 insertions, 21 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/Manifest b/games-util/pyfa/Manifest
index 3e16991493f5..810310f48282 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -1,24 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX configforced.py 144 RMD160 defbe8a6b64ac742062d73df87e6b71b76ad53ab SHA1 fb159ffed205b303dd9bc0e18c65fd2436af377a SHA256 289eaf04b78739937b6d4e0c144136a9c8174d59a98304cb52dbcae6a28dda66
-AUX pyfa-1.1-staticPath.patch 979 RMD160 81a30a7a812a05d8e37dd7460983c60858a01452 SHA1 f893c976783dc324fb4f8182495dc1bc578b2a2a SHA256 2efdd1a18271f919553c03e37e3552805e18cd6dee4fd0fc310bb315f3616d92
-AUX pyfa-1.1.4-wxversion.patch 1290 RMD160 e44ce67eccda79d7ed986e24a1f787b0b15fc341 SHA1 ca7b8d5581bc57d0833a8599eae90a863e04372f SHA256 5bcd443238fa6b9c02861e7c16c2f2c9b297aee9400c6ebd4844280252e06dce
-AUX pyfa.desktop 155 RMD160 37f31fe5d62b2690b7761babb0dfeb8c0171ae80 SHA1 cb3a43b949524de9692f323cda9e7adad2efe218 SHA256 c395891d87eaaac64e3ba7954d623efaf161d906527099ed4b0c680c63a041eb
-DIST pyfa-1.1.6-escalation-src.tar.bz2 3814957 RMD160 889fb690a51fbc9827cdb787d9bc57117caa3e02 SHA1 c19ebc6b0af766947373c4ef1c9ad107bbe086a6 SHA256 ca91944e2de17c41573f8faaa5c4691fab61d1c40c7753e37855aae542b563e2
-DIST pyfa-1.1.7-inferno-src.tar.bz2 3826060 RMD160 719c5dc2c512b181b53f737ee9ecf42df594e02b SHA1 e5d6bc9114862c01d1e2d7cbb60c753132a7ad96 SHA256 2d4bbafc43c9563564919c7d2e51a3daa84fd06fb1a8cf99ba07a5c9cf235d99
-EBUILD pyfa-1.1.6.ebuild 2057 RMD160 4ef8c9027db2c20ef4b724ac6020d9ed77af9d92 SHA1 9d7a91bd64928ca017f558488bec13316485a200 SHA256 71c63db128648130f86b2e8d8017145c13faa7d18b3756375967650c8c52d0e3
-EBUILD pyfa-1.1.7.ebuild 2054 RMD160 c7cd06abf4518a1127caf8382c00edfddb754806 SHA1 4a0d33a1200297c9871f860944c65e51bde909fe SHA256 4540aa2f220779a03ff520504ac31d46a9e5b5c681cf54a60e9b41de11724f51
-MISC ChangeLog 2440 RMD160 534ff2ce94cdb04a0353d2786cc44f2eabc6a8f1 SHA1 3fd27866c2552c483efe6cc841e535788e8654bb SHA256 7d5fc55949899a7ff2c6e72edf979ee0f5938d671fa8324f5034179f250b95b6
-MISC metadata.xml 595 RMD160 6d804a6ba1ac41e068bb525bdfbf102557f48d9a SHA1 916ecfe82fc370f9d58d17e5bfe00c5b2ebc8719 SHA256 d156a4f7b850289a6d11948ef082c26cd67040d98bce8a9b7ac8ce6ec14c9eec
+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.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.7-inferno-src.tar.bz2 3826060 SHA256 2d4bbafc43c9563564919c7d2e51a3daa84fd06fb1a8cf99ba07a5c9cf235d99 SHA512 cc713a5cf95054571249fd0304342b4bac6ef64741740eb360880d2fb0f15bfe14321a18d44708748952445dcd6ac72203445c658846b9459dd6b0c57542333e WHIRLPOOL 93066ac273c8a91685015ccaade4f4fa17ccf5a56463c4163ecf4d5a88cda413eb33bad7fee8171f0c91f7f28995fad396e8ad6064fa980e74d163c1dd2a51f6
+DIST pyfa-1.1.8-inferno-src.tar.bz2 3742454 SHA256 8223552e688e20214dbbee106ad81d80c0e515e0969be0c32fb2e5e948b68fbe SHA512 814a3044c498170aeb4ee4b3a3f8ade2b3cd3baf260a84d1ca6411cf87acfea57fdfdb6b2bd9b2db75d6433e14f75e2467be41d1357d01a89f024594ebb38854 WHIRLPOOL 0f51bb1620e7a431b792896c66a7d32e76ec2dc89fe33ffc278512e35df13d68249a34428c0426a9a9d64b08f0cb83cebb0fe1e22e1bc72f7ee304dd97cc260f
+EBUILD pyfa-1.1.7.ebuild 2054 SHA256 4540aa2f220779a03ff520504ac31d46a9e5b5c681cf54a60e9b41de11724f51 SHA512 d99f2a8fc396f31caaa63f11ab384ba622aa866853feb073ceba2bc76b7008960d9d72ac44f0f886f7f81e9df96cedfcebcee8a36d1d659f7cfbee73345d5b0e WHIRLPOOL ac96e7bb991dcf9ccf49261241b7b1f14fdad88ac3aa07f54e463c65d8041f3620c7fddd72d194cc524d0f8c9075cfc7678d5c854e43148775f56232648e79fd
+EBUILD pyfa-1.1.8.ebuild 2207 SHA256 e53f005bb5ebfd797769b44537870a482a1b6d1ecb891e8f1c97f4de4375ebdf SHA512 84d7a7a0f16840d23ea42f05bd719e1fbf7482f2fb1199b9ef73e1e3f59a83b5609ff59c3d35c57188331314373391fd94aa54f103e5ab9518fc760bea9c7843 WHIRLPOOL 2d72e5cba686213c86a18243fae98501aafea5f966d324c2bd532abfc4f78c9a8ea5d2482d93824f2c12710c1969fb188538aa89d52198679fe8b6c378feebfe
+MISC ChangeLog 2713 SHA256 804a715438fd5005267570eb93e540d34d2575e529c78f32943a0e367b269916 SHA512 3b5e884b86a5489ae564d8433168b7d04a4746e19884958c7c51e27a038fb2acf1801aeb0aa6d4af9bab44593d932fea28ccb10439447f7a8d6ddac6851cf423 WHIRLPOOL 7ae774d39b90892ab2741903373abe1ae92995f8e823b6cce7617cc7e7674efe6ba8d220902562924e3220c355a038a6211174f3afc039e37544b7747e6d40c9
+MISC metadata.xml 595 SHA256 d156a4f7b850289a6d11948ef082c26cd67040d98bce8a9b7ac8ce6ec14c9eec SHA512 e1452ad7b29d102e5522de9fea0a47a239c04b21315a2d53ccc6bfc9fc92fde6968a48e95999c79ae464029a551f7d38a19b355b04129550e762f0ff1be33fa0 WHIRLPOOL 76db6e34117e8051e658ced61c1dc0c00b9ce8983f5fbc2fd198224f8101687222ecc934bac555cee5ce8f27dda1ff3f469dacd89ad91fe7125903fc7413f960
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPvgKqAAoJEJ0WA1zPCt1hBnsH/0+M2eWxh0uizk3RZjZb7ygM
-I51ERrovn/LCYcUIYZwQuisu6rglD62DZwcEvTNC5hshOMZ5y34rszsVYys/4OCD
-GP5HunwIbbwuVH7m+2Cz2Tn9w8iunAKDX2rIXKb+PAhN9Y9n+eKj7KmL4aOtfqRV
-kXKLu8QwA3ezZX1mFuEmzvK6+FzAoUDFlGN7Y8+MY3iOxYTo15UEEUr4FP52vgMd
-EGbxkqcVZnt2HVsYSIxZblC8II0j2btBVZbScULacja7qwb7dnSnoO8ZZH5HQH/S
-R51CAIjBY50aZi0Or6CYtVW1SLqUaVRx6bK4CxsFfVK2oU7LiTn9XDHUWWCrpcM=
-=ZRat
+iQEcBAEBCAAGBQJQA+dNAAoJEJ0WA1zPCt1h6FUH/RxBaPqk4LT2zqMObjBsN269
+1Lr4GzYyBEQEhFvJhmFhzr8iIB5a0D/OBwtE5NVPQHhVCjxzROjkv25Oatf/mq8Z
+BEs5p9SFiWFTTDBeSPdWhadNcg5foJCXssjc/j0UoA8wkxXUD+EqGz+KDDNAbnJI
+vs2v4XdLyqazJygV8BLwKhgKI5wzo1UoAW7K2axHwAJlmfJ4SDdqrAMqrbRMoF1X
+lW8/WNIeZ67jN5vEtYWBY3nh8kcQD/xPavuGPcNNGWXtg0tx0ISISwqJ+8HCFcU8
+sqXMEcOA33mAZkQI/PuC6qgcDNC3gLuURcsMZIBVPdj5AibGPNK5FsgPh+bCLGg=
+=/DmD
 -----END PGP SIGNATURE-----
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}:" \