Bump, fixes Marauder bonuses and some rig stacking bugs. Update license, homepage. Drop old.

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

4 files changed, 34 insertions, 24 deletions

diff --git a/games-util/pyfa/ChangeLog b/games-util/pyfa/ChangeLog
index 05af45fdb19b..77b64b840dbc 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.14 2012/08/11 19:36:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/ChangeLog,v 1.15 2012/11/23 10:45:16 tetromino Exp $
+
+*pyfa-1.1.10 (23 Nov 2012)
+
+  23 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org> -pyfa-1.1.8.ebuild,
+  pyfa-1.1.9-r1.ebuild, +pyfa-1.1.10.ebuild:
+  Bump, fixes Marauder bonuses and some rig stacking bugs. Update license,
+  homepage. Drop old.
 
 *pyfa-1.1.9-r1 (11 Aug 2012)
 
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index a491a7b63044..f69c6233332c 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -6,20 +6,20 @@ AUX pyfa-1.1-staticPath.patch 979 SHA256 2efdd1a18271f919553c03e37e3552805e18cd6
 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.8-inferno-src.tar.bz2 3742454 SHA256 8223552e688e20214dbbee106ad81d80c0e515e0969be0c32fb2e5e948b68fbe SHA512 814a3044c498170aeb4ee4b3a3f8ade2b3cd3baf260a84d1ca6411cf87acfea57fdfdb6b2bd9b2db75d6433e14f75e2467be41d1357d01a89f024594ebb38854 WHIRLPOOL 0f51bb1620e7a431b792896c66a7d32e76ec2dc89fe33ffc278512e35df13d68249a34428c0426a9a9d64b08f0cb83cebb0fe1e22e1bc72f7ee304dd97cc260f
+DIST pyfa-1.1.10-inferno-1.2-src.tar.bz2 4312159 SHA256 e611708967d9af491b5878acf31f72addc585176408667e7edbf5e26f9122103 SHA512 7896e2d2e9b9a3893843136218c76a57f2e2d8a3b80753c9501437ac0e599298c6321f325ea69cb71ee8212068aa6ba4459bd664c7b306211cfe3cd5333b4932 WHIRLPOOL 3be308740ed6c62ccf415e50a31fb7a331544bb1d4f945e714034955a6bfcae760a45d445e1707e015655580280708297b08ae04019ddbb797e6c67cdc838242
 DIST pyfa-1.1.9-inferno-1.2-src-r1.tar.bz2 4323345 SHA256 dc2c2d258ba9c4518f973ab59735987b41083db5296687b1eacc0c21a5934cc8 SHA512 6677e1d15c1cb466d0c7dd3043512810e4c84fcb221dfc39fff4f4ff0dcf906f482750ea0aae25e6655a0c00138b7a3c8402ab261ca09999e022efd90c0b8907 WHIRLPOOL 6ef331b5f939074300eb481ade6eedeea1be25da697ae0baca96006295453d5672c0b3e05d72e1b4098e342dc746803ac70cf80ac3c14038565340e99df07f48
-EBUILD pyfa-1.1.8.ebuild 2207 SHA256 e53f005bb5ebfd797769b44537870a482a1b6d1ecb891e8f1c97f4de4375ebdf SHA512 84d7a7a0f16840d23ea42f05bd719e1fbf7482f2fb1199b9ef73e1e3f59a83b5609ff59c3d35c57188331314373391fd94aa54f103e5ab9518fc760bea9c7843 WHIRLPOOL 2d72e5cba686213c86a18243fae98501aafea5f966d324c2bd532abfc4f78c9a8ea5d2482d93824f2c12710c1969fb188538aa89d52198679fe8b6c378feebfe
-EBUILD pyfa-1.1.9-r1.ebuild 2255 SHA256 dcaeb9f6b513326d9fa9eea3a12383466ca89c2900033dbff8baab03d7990783 SHA512 57a1fb685ab4354bcca9845c5d80c6cfc2c8d263063ab6560c6700d77ee831d94f893663ac8b0f008b7e489f61ce250b159f151ada0e58736d3da5cc4ce200a9 WHIRLPOOL 828672de27ddc345085b3f6a09c1966f64babb48f4fa3721ba91c96e4db5b5e7e0195c8f20cec760bdf183742091966a933982e3c861d104b7af165bd647e478
-MISC ChangeLog 3076 SHA256 9e6df663939c83cbd8ed08295a954e751c8ad48d940d50f0ae92fcf3a633ef64 SHA512 311b095f3eb9883dc17b7d0332579ee48690d76754450194024948010a70ab2135d4ceb6abb4e7da485f34b029a5d4465191655ed137505977e6a43aba17d2c1 WHIRLPOOL 7c5f1912bdd0f5da97090f7b7b0f1be052bce7e728e8de620df6e8921afe4206bde7e7c62dc68c56bc208f2c2e3dd6d4b41920dcb3864fa99aba39814ee909fc
+EBUILD pyfa-1.1.10.ebuild 2373 SHA256 f9213f64455276506f64217d41d972560d169e893571b8319d22dfc906174d11 SHA512 a797d80d96a3ae6cc79decfd007f04a358914b769de72bd6ab4fee80ae04de563e5ff2e9fec62494d7373bd55417993efb1b45ac7c5b615c6b229a7c2d54b3ab WHIRLPOOL 8b1ae4c42d52ad7ca2561a6da752276f0a5808df18f4a0f0b4402aa0af571bc55482287e75482415f9dd7b1fec24ae9c26bd18c1188d7e01a00546f9b6c5282a
+EBUILD pyfa-1.1.9-r1.ebuild 2274 SHA256 3c735cbb5cff4aa52e702f91a405d198b00f84888eb74b602f2fe8b61ac17936 SHA512 a8c28cd13ab5e82526fabdb9a8d8f90e1f0e2d6973e98c521e6c80ab2bceaef563171e56aa842315510edfb0b830473c8aa4e42eda5316922c9c4055035b05a1 WHIRLPOOL 2db09a698fdf721424de2df32ded9a2abb738c402e3408424d2a2336c22bbaeba9ff51a295ad7b89b61229313c0ca5baf70f1c080def1269de926e4f9383d844
+MISC ChangeLog 3326 SHA256 ff2c0414735e1443785fdd5e8a0433bf65cda26efe6237d77e5f5ec1fcf63c42 SHA512 dd34d6dc1660e65b874163bda156fb8c4fff415117851b0aa7fb864e4b86d5941d369b37453307756899cee8eac40d147638abae4a36d0a86b81fee89906cab9 WHIRLPOOL ef1062027e66169edb1bc168bbc1bf72237024b85526ed4c1de67fc89b0911baf89baba6cf5a8813ed3d78b186c494adf3a746d8360a2b364dfe8a1dc3c688ce
 MISC metadata.xml 595 SHA256 d156a4f7b850289a6d11948ef082c26cd67040d98bce8a9b7ac8ce6ec14c9eec SHA512 e1452ad7b29d102e5522de9fea0a47a239c04b21315a2d53ccc6bfc9fc92fde6968a48e95999c79ae464029a551f7d38a19b355b04129550e762f0ff1be33fa0 WHIRLPOOL 76db6e34117e8051e658ced61c1dc0c00b9ce8983f5fbc2fd198224f8101687222ecc934bac555cee5ce8f27dda1ff3f469dacd89ad91fe7125903fc7413f960
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQJrRaAAoJEJ0WA1zPCt1hUUsH/j/ZuJlKyQpsy4LI4TjKgztP
-RNZulGHq0AtKXqkcQjsUW5dZQC7zN/wVonttLZNSuqK27QFzzJvOWdg9nApz8nl/
-mjGx7LnzCnLcKKDH0NWNce5L2Mfi8GSja47FhFvqBsqSos5L5Wv7T3umx6FQ5sGb
-TM4ds0qphbmxtcc4bzbU/VaP9/o36/jLwkaD5BA6FVH06kkM2dal+3HiZH7N8UEP
-/g5rBUayKzRqsW56uBuUmRa8ajfJp4AZOEWgi5lKRTH+K+zUNDYxyGhnkFC5V1IN
-fm9CVM17CaNtKB+BvB4Mxz/6gXBZ1SDFuJ4YrQkqRYSex9X1KssaDRAVtdzjnxY=
-=wYYv
+iQEcBAEBCAAGBQJQr1O9AAoJEJ0WA1zPCt1hT8wIALeF6L7Y3PACIIBKYpNyPC6V
+UOBmDBAUpXtPbneDQ8EouCFGGQCz015ul6l62anx+r1BPeRfS8lOqQbx0PETFzbS
+kfP2fG7dgm6TWBJEnmyItJw9QBtOeyQVOe89u95CKlffn9TZlufQeCkz7Th3WmZQ
+/KY2+BVEXUj2yIP7ihd5V5Dlv84YnJSdgC5gEuLwoh0poH72EITON+6QVR5g363t
+rdZGx+LCmkApmTWHLdPqTq/74B8bAhy5OiyTIuPxCUGOxJ1gBRB+rsSEiXu6p5XE
+BgsuakLeNFpQFANhwqhCVHDEcqiNYjyDQ/Cm0Foj22gI/2j3C/bV9hcDnqP2334=
+=ee70
 -----END PGP SIGNATURE-----
diff --git a/games-util/pyfa/pyfa-1.1.8.ebuild b/games-util/pyfa/pyfa-1.1.10.ebuild
index 51e8f7823c28..eb3e8090f648 100644
--- a/games-util/pyfa/pyfa-1.1.8.ebuild
+++ b/games-util/pyfa/pyfa-1.1.10.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.8.ebuild,v 1.1 2012/07/16 10:04:47 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.10.ebuild,v 1.1 2012/11/23 10:45:16 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -9,18 +9,18 @@ PYTHON_USE_WITH="sqlite threads"
 inherit eutils gnome2-utils python
 
 if [[ ${PV/_rc*/} == ${PV} ]] ; then
-	MY_PV=${PV}-inferno-src
-	FOLDER=stable/${PV}
+	MY_PV=${PV}-inferno-1.2-src
+	FOLDER=pyfa/stable/${PV}
 else
 	MY_PV=${PV/_rc/-stable-RC}-src
-	FOLDER=stable/${PV/*_rc/RC}
+	FOLDER=pyfa/stable/${PV/*_rc/RC}
 fi
 
 DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="http://www.evefit.org/Pyfa"
+HOMEPAGE="http://www.evefit.org/static/pyfa"
 SRC_URI="http://dl.evefit.org/${FOLDER}/${PN}-${MY_PV}.tar.bz2"
 
-LICENSE="GPL-3 LGPL-2.1 CCPL-Attribution-2.5 free-noncomm"
+LICENSE="GPL-3+ LGPL-2.1+ CCPL-Attribution-2.5 free-noncomm"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+graph"
@@ -28,7 +28,7 @@ IUSE="+graph"
 RDEPEND="dev-python/sqlalchemy
 	dev-python/wxpython:2.8
 	graph? ( dev-python/matplotlib[wxwidgets] dev-python/numpy )"
-DEPEND=""
+DEPEND="app-text/dos2unix"
 
 S=${WORKDIR}/${PN}
 
@@ -38,6 +38,9 @@ pkg_setup() {
 }
 
 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
+
 	# make staticPath settable from configforced again
 	epatch "${FILESDIR}/${PN}-1.1-staticPath.patch"
 
diff --git a/games-util/pyfa/pyfa-1.1.9-r1.ebuild b/games-util/pyfa/pyfa-1.1.9-r1.ebuild
index 5c915cd80d7f..c6cf92d432e1 100644
--- a/games-util/pyfa/pyfa-1.1.9-r1.ebuild
+++ b/games-util/pyfa/pyfa-1.1.9-r1.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.9-r1.ebuild,v 1.1 2012/08/11 19:36:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.9-r1.ebuild,v 1.2 2012/11/23 10:45:16 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -10,17 +10,17 @@ inherit eutils gnome2-utils python
 
 if [[ ${PV/_rc*/} == ${PV} ]] ; then
 	MY_PV=${PV}-inferno-1.2-src
-	FOLDER=stable/${PV}
+	FOLDER=pyfa/stable/${PV}
 else
 	MY_PV=${PV/_rc/-stable-RC}-src
-	FOLDER=stable/${PV/*_rc/RC}
+	FOLDER=pyfa/stable/${PV/*_rc/RC}
 fi
 
 DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="http://www.evefit.org/Pyfa"
+HOMEPAGE="http://www.evefit.org/static/pyfa"
 SRC_URI="http://dl.evefit.org/${FOLDER}/${PN}-${MY_PV}.tar.bz2 -> pyfa-1.1.9-inferno-1.2-src-r1.tar.bz2"
 
-LICENSE="GPL-3 LGPL-2.1 CCPL-Attribution-2.5 free-noncomm"
+LICENSE="GPL-3+ LGPL-2.1+ CCPL-Attribution-2.5 free-noncomm"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+graph"