Bump. Adds Crucible 1.0.2 updates, proxy support, bugfixes and UI improvements. Install icons in all available sizes. Drop obsolete version.

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

4 files changed, 25 insertions, 35 deletions

diff --git a/games-util/pyfa/ChangeLog b/games-util/pyfa/ChangeLog
index 470d140c906c..1e8bcc32de9d 100644
--- a/games-util/pyfa/ChangeLog
+++ b/games-util/pyfa/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-util/pyfa
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/ChangeLog,v 1.2 2011/11/30 18:33:25 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/ChangeLog,v 1.3 2011/12/26 03:40:41 tetromino Exp $
+
+*pyfa-1.1.1 (26 Dec 2011)
+
+  26 Dec 2011; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
+  -files/pyfa-1.0.3-staticPath.patch, -pyfa-1.0.6.ebuild, +pyfa-1.1.1.ebuild:
+  Bump. Adds Crucible 1.0.2 updates, proxy support, bugfixes and UI
+  improvements. Install icons in all available sizes. Drop obsolete version.
 
 *pyfa-1.1 (30 Nov 2011)
 
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index 23981c309336..1df524a510fb 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -1,20 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX configforced.py 144 RMD160 defbe8a6b64ac742062d73df87e6b71b76ad53ab SHA1 fb159ffed205b303dd9bc0e18c65fd2436af377a SHA256 289eaf04b78739937b6d4e0c144136a9c8174d59a98304cb52dbcae6a28dda66
-AUX pyfa-1.0.3-staticPath.patch 614 RMD160 97ed39cc2522781d14e0c49dce0a8a79a382cbf8 SHA1 c9b280716b1d7a12f272c4b991a4ceca1aef7099 SHA256 eae228f31928750be19950a9268d5fe233a108b5af4eab436aa4db0fb5e5bab1
 AUX pyfa-1.1-staticPath.patch 979 RMD160 81a30a7a812a05d8e37dd7460983c60858a01452 SHA1 f893c976783dc324fb4f8182495dc1bc578b2a2a SHA256 2efdd1a18271f919553c03e37e3552805e18cd6dee4fd0fc310bb315f3616d92
 AUX pyfa.desktop 155 RMD160 37f31fe5d62b2690b7761babb0dfeb8c0171ae80 SHA1 cb3a43b949524de9692f323cda9e7adad2efe218 SHA256 c395891d87eaaac64e3ba7954d623efaf161d906527099ed4b0c680c63a041eb
-DIST pyfa-1.0.6-incarna-src.tar.bz2 7914901 RMD160 b36dbb8cb2afd5ae396b7eafb3279d18cc6c5aa3 SHA1 c2964b46d3c46ba44930390129b0f39c959a4c28 SHA256 e63f6b54d2eeed660e24cb36d62318c28156f8a08b003ab10118d974a5e18f4b
 DIST pyfa-1.1-crucible-src.tar.bz2 3981253 RMD160 6c5778faa6c22c3cc6ffe49acd49dac46c8cc7ef SHA1 d57b3a0b0197d0d0d50f32341eb0a1a1dd4e984e SHA256 473f573546c71d5c76b1a57eede29e611bb7eb0b48316bc3c59a3d921084a942
-EBUILD pyfa-1.0.6.ebuild 1712 RMD160 4c5c3015c81e9a06d37def176e0f002ca5d24512 SHA1 1acb7b7b7f2a6d56f654f38612e3bd94d4ea00e2 SHA256 f68d399a1ab3e2726297c0585cc61fed34c7f6074f858801aa668af237a6c7b7
+DIST pyfa-1.1.1-crucible-src.tar.bz2 4067326 RMD160 91b8417765758e2b12cec89a6c97fe4294a1a0ab SHA1 ad7452142acb07cd42d5ce032edf6b6cfb8d5e86 SHA256 e8ade754d85cf5a9a9718cd2ae696e9182c0e19fbefc79432edd6d2362161807
+EBUILD pyfa-1.1.1.ebuild 1939 RMD160 9367fb158c509119355f454c87744dd97939bef7 SHA1 07da31f63e48eb479caaa0238a21753a3f905997 SHA256 edea4f9a79cc5da75da0f04f31730156d304ee42da4bfcab66d45c2c048fba09
 EBUILD pyfa-1.1.ebuild 1709 RMD160 4156cb52195929817a4d7eb9902bfc071314b937 SHA1 eb1facbabd129614b552b71636c57da803cee3ff SHA256 92d0cedf005e937c352112340b67670c025725a331c60bb8c9d7920d43e27bdc
-MISC ChangeLog 693 RMD160 80881970b471719f9f0cd221f3b5978a7fa06b29 SHA1 ae8c27bcb5fb239bf220c6f3a0d648e7f73d3a88 SHA256 33c8be81b2b4896fd119e49789fda7e5ac71fd25cefd5fea8d1b3b0249c52bf1
+MISC ChangeLog 1014 RMD160 05de42be5da4bb4a2e648f3d4e5122bfb51fbbad SHA1 3175d5874d1820f6544c202aaf46661210a49789 SHA256 207c9e3617f2d54e1769671f61342f2053d5f181193a639e939a373b29a0069d
 MISC metadata.xml 595 RMD160 6d804a6ba1ac41e068bb525bdfbf102557f48d9a SHA1 916ecfe82fc370f9d58d17e5bfe00c5b2ebc8719 SHA256 d156a4f7b850289a6d11948ef082c26cd67040d98bce8a9b7ac8ce6ec14c9eec
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iF4EAREIAAYFAk7WdvoACgkQdjK8w9WeBnCf8AD/bKSigkJKy4D8ItDMCW1DaFMD
-L5/LOBylAzpw513bcwQBAIVdNR0BLkDUONe2uw3FtS2iZjUT3q0AhtY8tPKigO9V
-=IBJE
------END PGP SIGNATURE-----
diff --git a/games-util/pyfa/files/pyfa-1.0.3-staticPath.patch b/games-util/pyfa/files/pyfa-1.0.3-staticPath.patch
deleted file mode 100644
index 4eff73006c62..000000000000
--- a/games-util/pyfa/files/pyfa-1.0.3-staticPath.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Make staticPath settable from configforced
-
---- a/config.py
-+++ b/config.py
-@@ -30,7 +30,9 @@ if savePath is None:
-     savePath = unicode(os.path.expanduser(os.path.join("~", ".pyfa")), sys.getfilesystemencoding())
- 
- # Static EVE Data from the staticdata repository, should be in the staticdata directory in our pyfa directory
--staticPath = os.path.join(pyfaPath, "staticdata")
-+staticPath = getattr(configforced, "staticPath", None)
-+if staticPath is None:
-+    staticPath = os.path.join(pyfaPath, "staticdata")
- 
- # The database where we store all the fits etc
- saveDB = os.path.join(savePath, "saveddata.db")
diff --git a/games-util/pyfa/pyfa-1.0.6.ebuild b/games-util/pyfa/pyfa-1.1.1.ebuild
index e73a95f79917..7f89f74c09e4 100644
--- a/games-util/pyfa/pyfa-1.0.6.ebuild
+++ b/games-util/pyfa/pyfa-1.1.1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.0.6.ebuild,v 1.1 2011/11/02 23:59:34 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.1.ebuild,v 1.1 2011/12/26 03:40:41 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
 PYTHON_USE_WITH="sqlite threads"
 
-inherit eutils python
+inherit eutils gnome2-utils python
 
 if [[ ${PV/_rc*/} == ${PV} ]] ; then
-	MY_PV=${PV}-incarna-src
+	MY_PV=${PV}-crucible-src
 	FOLDER=stable/${PV}
 else
 	MY_PV=${PV/_rc/-stable-RC}-src
@@ -39,7 +39,7 @@ pkg_setup() {
 
 src_prepare() {
 	# make staticPath settable from configforced again
-	epatch "${FILESDIR}/${PN}-1.0.3-staticPath.patch"
+	epatch "${FILESDIR}/${PN}-1.1-staticPath.patch"
 
 	python_convert_shebangs -r -x 2 .
 	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
@@ -57,14 +57,23 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins -r staticdata
 	dodoc readme.txt
-	doicon icons/${PN}.png
+	insinto /usr/share/icons/hicolor/32x32/apps
+	doins icons/pyfa.png
+	insinto /usr/share/icons/hicolor/64x64/apps
+	newins icons/pyfa64.png pyfa.png
 	domenu "${FILESDIR}/${PN}.desktop"
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
+	gnome2_icon_cache_update
 	python_mod_optimize ${PN}
 }
 
 pkg_postrm() {
+	gnome2_icon_cache_update
 	python_mod_cleanup ${PN}
 }