Version bump for Rubicon 1.1; remove obsolete version.

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

5 files changed, 37 insertions, 30 deletions

diff --git a/games-util/pyfa/ChangeLog b/games-util/pyfa/ChangeLog
index f5e18bfacd36..bb8b41e6caf1 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.24 2013/12/02 02:09:29 tetromino Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/ChangeLog,v 1.25 2014/02/05 06:17:45 tetromino Exp $
+
+*pyfa-1.1.20 (05 Feb 2014)
+
+  05 Feb 2014; Alexandre Rostovtsev <tetromino@gentoo.org> -pyfa-1.1.18.ebuild,
+  +pyfa-1.1.20.ebuild, pyfa-9999.ebuild, +files/pyfa-1.1.20-staticPath.patch,
+  -files/pyfa-1.1-staticPath.patch:
+  Version bump for Rubicon 1.1; remove obsolete version.
 
 *pyfa-9999 (02 Dec 2013)
 *pyfa-1.1.18 (02 Dec 2013)
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index 52406a99bef6..6c0057ca127f 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -2,23 +2,23 @@
 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.20-staticPath.patch 870 SHA256 3758e6c463650546be4c74241c55412652ca0c8e4f62261be76ea3e984fac9d0 SHA512 34aa6812a25d8d0f33976e74cb109040ae515042ab228fb14583038f0a87f43d09fd43d869ebe617076f1308df11bd943fca397fb9c80f95daddc591bbd824c0 WHIRLPOOL a9e3123233cd5e88b8821c7844dd1d01da84102c5f2fc29112b26f29edca34aa458ba1c9742c914c7751e0afa803ff0e0b584ecbd4aae85710a64a901c88d5a9
 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.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
+DIST pyfa-1.1.20-rubicon-1.1-src.zip 6411108 SHA256 cf87697d6cb9dc679fe7e50dccffcba99f87e48ccb327191fa97b8cb044dfa1a SHA512 d1a98685bbb93c537fddc9be6cd24105c3889fd2767322545e9a20db38cc76daf318eee21ada735b88b43bc82b673fdefc218fca837028075335f05ad999a642 WHIRLPOOL e0e897f280e09df2b21b01ba432388d0b7473c80e3b4b34b9ab317725f38ddbf4f5fb3ec491a4f1ddc1cc885e9cb981b50594a7e9c6fbd23a121f44c77c33026
+EBUILD pyfa-1.1.20.ebuild 2619 SHA256 01e4de655b01ab4f74435a48689d1d2e766582b35483ded05f83cf87232bd238 SHA512 48ee63fba64b1a01af2a910b7fcbe7d98bddda0ad851a96d3c8cef7c61f48a60237fafe18280f748a345f4320d2ba5ac2ba549a4f9b7488a31fa8c3a84cf7f69 WHIRLPOOL 3cd0a5dc749165d5531c01c03621c5c70e2bc7ce1febb9c0a7ca5b45c34c938ec5aa6aae9fea5d5dde833ea6d9c09c630d3dca44b6be4d89b09aa94da7a19790
+EBUILD pyfa-9999.ebuild 2617 SHA256 f563fec5b262da7072654279fa8681cdaa7d0aa72dca5dcfca8257f305f9e3e2 SHA512 b8f9875bab7762db161a57283cebab90f73dcde6f98635f4dfcb5c791359d69d5afa12fc591aaf47e8374777c4a9191557d076913e6cfbc202dde49dd7736117 WHIRLPOOL 08577c48e74644ad37dca40e5ee9dcb693f204f4f8018fa4299795bd5c8ee84e0aba2a9c9fa6717da2c9114308bc74c73bb361d26ee6ccee8cb86add5484c618
+MISC ChangeLog 5631 SHA256 9f7d55bf73e566265fbb674bae70c7821c2256469e33f3ec42194b4d77d9f692 SHA512 6eb410159d9ad29da85a2ce4a241f9e1d6368dfeb69ab23b4d9340948c18b0ed742c991095e810a9f935682aa140b712a66a26d9ae23f53d491b7256f33b2359 WHIRLPOOL d54aa3df144c03de7f7f4e3e999ee17b4733da8d8dbc37178a5aeb21d437377fbe8d4d367e5e04f6d1c00867fb2e3f606676b2521efad0d76086365aa681014c
 MISC metadata.xml 595 SHA256 d156a4f7b850289a6d11948ef082c26cd67040d98bce8a9b7ac8ce6ec14c9eec SHA512 e1452ad7b29d102e5522de9fea0a47a239c04b21315a2d53ccc6bfc9fc92fde6968a48e95999c79ae464029a551f7d38a19b355b04129550e762f0ff1be33fa0 WHIRLPOOL 76db6e34117e8051e658ced61c1dc0c00b9ce8983f5fbc2fd198224f8101687222ecc934bac555cee5ce8f27dda1ff3f469dacd89ad91fe7125903fc7413f960
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSm+vjAAoJEJ0WA1zPCt1hWUgH/3LKXCrrdzZ90QUqdYma9uOl
-m0deo5jtSOfn97jmw6vON8cwHGrKeof2IIYDIoMbY9pa6vEi7hqFN3gpW0R4AUu4
-iBxWud/m85AbnXdbYhdFS0l7kCB1MKM3w/01TrlmiIJZSzVSIlBaIryJ5liHFlvh
-VHkclX7yRcm1jVQxdDzEOSvFGLATuX/SrNrmLsUxrejztfqC9iOg0FClBSZbVHyX
-N5XRSxPXZNxypOHCy/slvqhFxw+zpQvr6C7bML1RZjErcxwAt2lliTxIrhKMigju
-zR/WVV4aUHzQ8taitXw5HFKo+JVbqB2aEBD5/1uwXvt4+2fynWvNUh1XxeeL4Ak=
-=Rio2
+iQEcBAEBCAAGBQJS8dg9AAoJEJ0WA1zPCt1hz0EH/0+49oQxYW2UKjun6RJ/AAoX
+Ehsccr4lV9movYk057tiCtprcTJLDnHnRfQqm5+wUhR9QfbOm1mCibW/mUcSY5PY
+4AJsOwMMeuAsrXxg51lNC6UDvpSnN5zevST93LdvOjDxuR53u1Gn/pA/dEo8g9/r
+Fyu96ZGC8pktnkHflE2263QI45fKtQtltfZCz1eW5SUYh1bbtkfK7F2WRBRS3uFp
+/Hnf8BynCoiK/sT9vSCx5tYyLc6d7JZHplo3pHs+fg5z1jvJJnH+5FZuj9gTLeHD
+XIFUwVjDxKGBdaAWm+Ch/yvD7sMdWawkCDc5F7TbbiKDDCzISG7o2FgKyeBiuCg=
+=/UNj
 -----END PGP SIGNATURE-----
diff --git a/games-util/pyfa/files/pyfa-1.1-staticPath.patch b/games-util/pyfa/files/pyfa-1.1.20-staticPath.patch
index d477f9c94d7f..cdcc9f90d3e5 100644
--- a/games-util/pyfa/files/pyfa-1.1-staticPath.patch
+++ b/games-util/pyfa/files/pyfa-1.1.20-staticPath.patch
@@ -1,20 +1,20 @@
-From 9a8411e9a6c58e5285ab3ae0a4feed05b6107acf Mon Sep 17 00:00:00 2001
+From 69660180a59d0d100097dedbc507d4af73267e8d Mon Sep 17 00:00:00 2001
 From: Alexandre Rostovtsev <tetromino@gentoo.org>
 Date: Wed, 30 Nov 2011 12:50:53 -0500
 Subject: [PATCH] Make staticPath settable from configforced
 
 ---
- config.py |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
+ config.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/config.py b/config.py
-index f2844b5..1f51700 100644
+index e39e0d3..e028c36 100644
 --- a/config.py
 +++ b/config.py
-@@ -48,7 +48,9 @@ def defPaths():
-             savePath = unicode(os.path.expanduser(os.path.join("~", ".pyfa")), sys.getfilesystemencoding())
+@@ -66,7 +66,9 @@ def defPaths():
  
-     # Static EVE Data from the staticdata repository, should be in the staticdata directory in our pyfa directory
+     # 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:
@@ -23,5 +23,5 @@ index f2844b5..1f51700 100644
      # The database where we store all the fits etc
      saveDB = os.path.join(savePath, "saveddata.db")
 -- 
-1.7.8.rc3
+1.8.5.3
 
diff --git a/games-util/pyfa/pyfa-1.1.18.ebuild b/games-util/pyfa/pyfa-1.1.20.ebuild
index 06138bee1020..6c437e74de90 100644
--- a/games-util/pyfa/pyfa-1.1.18.ebuild
+++ b/games-util/pyfa/pyfa-1.1.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.18.ebuild,v 1.1 2013/12/02 02:09:29 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.20.ebuild,v 1.1 2014/02/05 06:17:45 tetromino Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-2
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/DarkFenX/Pyfa/releases/download/v${PV}/${P}-rubicon-1.0-src.zip"
+	SRC_URI="https://github.com/DarkFenX/Pyfa/releases/download/v${PV}/${P}-rubicon-1.1-src.zip"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 IUSE="+graph"
@@ -38,7 +38,7 @@ src_prepare() {
 	edos2unix config.py pyfa.py service/settings.py
 
 	# make staticPath settable from configforced again
-	epatch "${FILESDIR}/${PN}-1.1-staticPath.patch"
+	epatch "${FILESDIR}/${PN}-1.1.20-staticPath.patch"
 
 	# do not try to save exported html to python sitedir
 	epatch "${FILESDIR}/${PN}-1.1.8-html-export-path.patch"
diff --git a/games-util/pyfa/pyfa-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild
index a41a75142da0..721a6d28a6c1 100644
--- a/games-util/pyfa/pyfa-9999.ebuild
+++ b/games-util/pyfa/pyfa-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-9999.ebuild,v 1.1 2013/12/02 02:09:29 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-9999.ebuild,v 1.2 2014/02/05 06:17:45 tetromino Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-2
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/DarkFenX/Pyfa/releases/download/v${PV}/${P}-rubicon-1.0-src.zip"
+	SRC_URI="https://github.com/DarkFenX/Pyfa/releases/download/v${PV}/${P}-rubicon-1.1-src.zip"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 IUSE="+graph"
@@ -38,7 +38,7 @@ src_prepare() {
 	edos2unix config.py pyfa.py service/settings.py
 
 	# make staticPath settable from configforced again
-	epatch "${FILESDIR}/${PN}-1.1-staticPath.patch"
+	epatch "${FILESDIR}/${PN}-1.1.20-staticPath.patch"
 
 	# do not try to save exported html to python sitedir
 	epatch "${FILESDIR}/${PN}-1.1.8-html-export-path.patch"