Version bump with various updates and UI fixes. Update homepage and source URI. Drop old.

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

4 files changed, 30 insertions, 41 deletions

diff --git a/games-util/pyfa/ChangeLog b/games-util/pyfa/ChangeLog
index cd2700c0f262..0a8e6cd2c1a8 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.20 2013/06/06 03:47:23 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/ChangeLog,v 1.21 2013/07/20 03:09:03 tetromino Exp $
+
+*pyfa-1.1.15 (20 Jul 2013)
+
+  20 Jul 2013; Alexandre Rostovtsev <tetromino@gentoo.org> -pyfa-1.1.13.ebuild,
+  pyfa-1.1.14.ebuild, +pyfa-1.1.15.ebuild:
+  Version bump with various updates and UI fixes. Update homepage and source
+  URI. Drop old.
 
 *pyfa-1.1.14 (06 Jun 2013)
 
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index 4d65e6d16b58..d43672aae004 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -7,20 +7,20 @@ AUX pyfa-1.1.11-import-pyfa.patch 880 SHA256 7a261bf8cb09845ec93f756437603abb132
 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.13-retribution-1.1.6-src.tar.bz2 4621792 SHA256 8f1f3e1cc1311d9d88b8d2ecc8cc1c87da1d828f99902ba04eca2f4455eb54cc SHA512 732a5ae1ccd736be3be4d7ec0e6b7a424a7ed20d2eaff23303a063cc3f7dbb4ef1b20153c78fe0007acd21cfa8391b6dc4f4480842ce6b3e2615ecd3380757a7 WHIRLPOOL f5261ddab9a28eb27dd7eb69d8e0a4009689a6ccf9f0ec7783e18fcc0f519f022001b1d42fd051f26c100b4b76ee0f4d1c58dbc1871356d2dfe0f2cca748460e
-DIST pyfa-1.1.14-odyssey-1.0-src.tar.bz2 4670588 SHA256 337f1fe0bed79eb83b7829351fd7d637c56f66fe603a747ab4ed7eb6ee8047f3 SHA512 ca85ec28ab590b41cd46f6907f4f0f610b0b9bbcdde10639853ae606f1d425cc25e01b4d788373e9ce7a61e9d00b122444a69e375efbfad408e5c8d3484c762b WHIRLPOOL 50c90bef5980ca1a5eca933e75cda0c0efdf3f2fb977696664e229a5df7161552d0d57a67bec88dcfea6a265811c5fa437dcb931b8e6e6500420c826c44acadd
-EBUILD pyfa-1.1.13.ebuild 2728 SHA256 78abd8914e1b558671eaa6251ca0195d2ba66db6c60d13783f9e0a67d367a628 SHA512 f58fbe05622b27231b68739c2b7f32739e38e415f573c259de39aa4be2f4ce8d16ce0a671bb17ab3705bd32eba3484087435aae6b33f644db6d4648f348fe5b7 WHIRLPOOL 683bb552636b10b5740e12eb4e221e3413d4ae5527304786f7ea916af30eb85eb723dcc276472dc7e7fad19d84242e625a5056e85cc1404737fa1022e4f045e6
-EBUILD pyfa-1.1.14.ebuild 2722 SHA256 39a3b5e8fdd8e4984bd717e1686f3452a8640d23dfffc4275142782cc2de4da1 SHA512 f5fb4ca75abaaa78662f0ba438e611bb9a8a9bf5b1f9332d1fc1e3dabea0db2197cdfec26ef04c7dc6ccecf539c2e6014c42e6a3307a82728f2c79acbfd3fc6e WHIRLPOOL 7a11d0ba8ec9553259dbcf14e1bb37dbec56ce951951e28883c54b871d5ef53164e385ab4ca5df10091bfc5ce4f021748c43ffb028f1d03e5602d87c4c9c68f2
-MISC ChangeLog 4374 SHA256 901d66f623223fb9a94614d73f018f4c4c41bad083cb24743ddbe0cf7318163e SHA512 d1169dcd26e233465fbb6f8d146c4549216f74750ca0541ffa5c2be5656aaa2b7f0af40e2b9525cff11c35e38bcf5282275ba5887155f1bb52bb256d7b89ad32 WHIRLPOOL 52147b16b8204c80d229f86882b97512688d2bd045b82b89d6465320b7beb5a772af4d02e2e3581d64e5be2e1b44a66700b4b297affcdcd4de49033d71560d38
+DIST pyfa-1.1.14-odyssey-1.0-src.zip 5965760 SHA256 0b1cc77dc0f8a45bfd02e8e5954b6de171c4797977becc755247535f48b7a500 SHA512 ad6ff638cd147e83e42bf3e243f32d4413ebc7a5313c4b44a7248cf40f761ae4ffb29c040cfe08c4db54a72d9c7aa9f17777de508fd264e7282618b82bf9fa3e WHIRLPOOL 8dcdb159921e8cd2115ac855a769fb8ba92e318b157c15c0849a28e79ec7062327bdb79a0ad090716856f361e92386c0f533e67f6dd4cdfc9bed8697a7bd720a
+DIST pyfa-1.1.15-odyssey-1.0-src.zip 5915271 SHA256 338a8084598740963a03cb8ff85bfdc6fbbd95544fef26996b8189afd0e5af04 SHA512 f5b967c8f15d938ca4943ee2a7f2a1a291c21cb9cae34b8dbf8713982eef2626301f4719e5e01a3031546573c7ce52383bd3ab6f043cb7e0c3d0e10bf0796696 WHIRLPOOL a674a8de5c8ce88221442afcdd8998494938369a2af527a31ef85e46c67fbfee1341952035f407d532518e88ab9f9f21c25136ca84bbefc9f4c185f90d4408ee
+EBUILD pyfa-1.1.14.ebuild 2545 SHA256 27d61c3bae4e91ad3be7a116345c976c256787133ba04f24835992bfc6bc3e08 SHA512 eb85668d0c9e7a30d84f275b8d189e3a33ea76890d1ad3aa1fef9d8f2187991ca26ab5e56705d76997719f8849952e6f4b7801601fd1735d81ebdde38b6f73be WHIRLPOOL 2c0fa91ddcefd2165f15d28635e6cf5b79255d4c3b7e56634444c847d91bc4efb70e0c6a71ae02cc5d11f2cf766619e8cdd18c2d98387f8084b0e164701f94e4
+EBUILD pyfa-1.1.15.ebuild 2545 SHA256 ef0c558aadbbca656a073857d1ba2a80c07292e4676281fa91525a21a8ed3264 SHA512 b8b4eeafc7aaea774110406a42086278727891fe12277dd539dfcc44a6f474eda03bb68442b51aafeda4dbd661528920b42b855fc545b75675a7520e4d7d56ed WHIRLPOOL 57f538817d86d61f9fe1c6fc6bb0b52ea6f7240e4a342622a76ce87b0c1851086101f47a446cd7de84410dcdb7e86f0fdb6448307c17d7a0a767f613e6960f3e
+MISC ChangeLog 4620 SHA256 3bd40b055410187f3bd493ee536affa44c8d807e1186157c59ade311147e663a SHA512 0a8f800e9be938a9376e9f3a4baa3b0a12e8d792723f18132d095d9859a1f400e1aa0c97e2f7be6865ba39e76094de614fb36f874ee927c598bff46c538682f0 WHIRLPOOL a4cbc854e4045297ba6ffa7b08c801e6c848bb1130a16cd5269c416bf220b3ef9e4e2a8584c3e6832a45c3220f1321e87705512ef1d03ab193e8aee313ce76ac
 MISC metadata.xml 595 SHA256 d156a4f7b850289a6d11948ef082c26cd67040d98bce8a9b7ac8ce6ec14c9eec SHA512 e1452ad7b29d102e5522de9fea0a47a239c04b21315a2d53ccc6bfc9fc92fde6968a48e95999c79ae464029a551f7d38a19b355b04129550e762f0ff1be33fa0 WHIRLPOOL 76db6e34117e8051e658ced61c1dc0c00b9ce8983f5fbc2fd198224f8101687222ecc934bac555cee5ce8f27dda1ff3f469dacd89ad91fe7125903fc7413f960
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRsAZTAAoJEJ0WA1zPCt1hfXUIAIqDceg1ejeqHi4ZSfVlwJAI
-QxvGer6oHN97bVRVJElUyVnukLK79k23OT6VPuYXY8QD4hLx5u32H/L/lKWypO0P
-JVCyL5nA7IoPB7iZsxVbivszi+SeJR7KrLy0JewBtImzIwfUwzRLL2Ooo6973oe9
-CNATlOPN3YtW9zCei4hvTwuwJ5H/k2eJPyrXXYGMdM4QNUYeAkslI0Q9JBymx2tt
-KHiAhsll3UXL0zCS0wHrvY1tcXjcF6T+RBixVyKbFA6kkMpr216KsFYizJm2UGgL
-MtJnNBz1U/eGm8qmK7ljALg7XoK7WFZ8/QlO1Vt8Igu/4evLBePWLBgtvB9y6y4=
-=dJGK
+iQEcBAEBCAAGBQJR6f9QAAoJEJ0WA1zPCt1hpRsH/1SwgEAKUPsUwsyweFFazJdk
+uxBMa7q9F6fWHK3dQtOIRosWbvxGRWk286TeZ0cvCGVub6hNYI4t9vr/cC7elfi7
+RoA7nxNO0sUtpJM3yzUvnUbUVnLZbXcDtvq6z8ndhC+YLkj9LKV6J/cYeuNj2pwT
+x8LbSytbl7YU5QRlgBr39m9ITOVhJyYUINykbwNOPizcw+t9ZUbBn22AuP4Ho+91
+jDi9jpnZMLbjv5hCEIZ9bcBQN97pNi4t/vOOG5qZW7WfAfKC/gJMGjbkvo9/ykcM
+MGjucxdmSGBD478UEl8FPyn6ANyrUEUtcOiZlxXBK9n2pL/Ffzd1cDGVhyGnfL4=
+=UTXY
 -----END PGP SIGNATURE-----
diff --git a/games-util/pyfa/pyfa-1.1.14.ebuild b/games-util/pyfa/pyfa-1.1.14.ebuild
index 83fdad157523..6a9070db1a0f 100644
--- a/games-util/pyfa/pyfa-1.1.14.ebuild
+++ b/games-util/pyfa/pyfa-1.1.14.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.14.ebuild,v 1.1 2013/06/06 03:47:23 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.14.ebuild,v 1.2 2013/07/20 03:09:03 tetromino Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -8,17 +8,9 @@ PYTHON_REQ_USE="sqlite,threads"
 
 inherit eutils gnome2-utils python-r1
 
-if [[ ${PV/_rc*/} == ${PV} ]] ; then
-	MY_PV=${PV}-odyssey-1.0-src
-	FOLDER=pyfa/stable/${PV}
-else
-	MY_PV=${PV/_rc/-stable-RC}-src
-	FOLDER=pyfa/stable/${PV/*_rc/RC}
-fi
-
 DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="http://www.evefit.org/static/pyfa"
-SRC_URI="http://dl.evefit.org/${FOLDER}/${PN}-${MY_PV}.tar.bz2"
+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"
@@ -31,14 +23,13 @@ RDEPEND="dev-python/sqlalchemy[${PYTHON_USEDEP}]
 		dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}] )
 	${PYTHON_DEPS}"
-DEPEND="app-text/dos2unix
-	${PYTHON_DEPS}"
+DEPEND="app-arch/unzip"
 
 S=${WORKDIR}/${PN}
 
 src_prepare() {
 	# get rid of CRLF line endings introduced in 1.1.10 so patches work
-	dos2unix config.py pyfa.py service/settings.py || die
+	edos2unix config.py pyfa.py service/settings.py
 
 	# make staticPath settable from configforced again
 	epatch "${FILESDIR}/${PN}-1.1-staticPath.patch"
diff --git a/games-util/pyfa/pyfa-1.1.13.ebuild b/games-util/pyfa/pyfa-1.1.15.ebuild
index de67a9fc0164..106c5e1e9457 100644
--- a/games-util/pyfa/pyfa-1.1.13.ebuild
+++ b/games-util/pyfa/pyfa-1.1.15.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.13.ebuild,v 1.1 2013/03/31 17:55:31 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.15.ebuild,v 1.1 2013/07/20 03:09:03 tetromino Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -8,17 +8,9 @@ PYTHON_REQ_USE="sqlite,threads"
 
 inherit eutils gnome2-utils python-r1
 
-if [[ ${PV/_rc*/} == ${PV} ]] ; then
-	MY_PV=${PV}-retribution-1.1.6-src
-	FOLDER=pyfa/stable/${PV}
-else
-	MY_PV=${PV/_rc/-stable-RC}-src
-	FOLDER=pyfa/stable/${PV/*_rc/RC}
-fi
-
 DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="http://www.evefit.org/static/pyfa"
-SRC_URI="http://dl.evefit.org/${FOLDER}/${PN}-${MY_PV}.tar.bz2"
+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"
@@ -31,14 +23,13 @@ RDEPEND="dev-python/sqlalchemy[${PYTHON_USEDEP}]
 		dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}] )
 	${PYTHON_DEPS}"
-DEPEND="app-text/dos2unix
-	${PYTHON_DEPS}"
+DEPEND="app-arch/unzip"
 
 S=${WORKDIR}/${PN}
 
 src_prepare() {
 	# get rid of CRLF line endings introduced in 1.1.10 so patches work
-	dos2unix config.py pyfa.py service/settings.py || die
+	edos2unix config.py pyfa.py service/settings.py
 
 	# make staticPath settable from configforced again
 	epatch "${FILESDIR}/${PN}-1.1-staticPath.patch"