Version bump, adds 'traits' tab.

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

3 files changed, 109 insertions, 9 deletions

diff --git a/games-util/pyfa/ChangeLog b/games-util/pyfa/ChangeLog
index bb8b41e6caf1..50476b6d06a1 100644
--- a/games-util/pyfa/ChangeLog
+++ b/games-util/pyfa/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-util/pyfa
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/ChangeLog,v 1.26 2014/02/20 03:18:27 tetromino Exp $
+
+*pyfa-1.1.21 (20 Feb 2014)
+
+  20 Feb 2014; Alexandre Rostovtsev <tetromino@gentoo.org> +pyfa-1.1.21.ebuild:
+  Version bump, adds 'traits' tab.
 
 *pyfa-1.1.20 (05 Feb 2014)
 
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index 6c0057ca127f..f59df0edc8b1 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -7,18 +7,20 @@ AUX pyfa-1.1.20-staticPath.patch 870 SHA256 3758e6c463650546be4c74241c55412652ca
 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.20-rubicon-1.1-src.zip 6411108 SHA256 cf87697d6cb9dc679fe7e50dccffcba99f87e48ccb327191fa97b8cb044dfa1a SHA512 d1a98685bbb93c537fddc9be6cd24105c3889fd2767322545e9a20db38cc76daf318eee21ada735b88b43bc82b673fdefc218fca837028075335f05ad999a642 WHIRLPOOL e0e897f280e09df2b21b01ba432388d0b7473c80e3b4b34b9ab317725f38ddbf4f5fb3ec491a4f1ddc1cc885e9cb981b50594a7e9c6fbd23a121f44c77c33026
+DIST pyfa-1.1.21-rubicon-1.1-src.zip 6124286 SHA256 7d711313ed1f4c5f4e9c9a9acedce821e2a9b1567ad74a41ade6dc0f63d11279 SHA512 e7a3ad77839c9871c279d14d6501d28184522d2df4cdae742c46febdb0d731f6de347078971c5407d5c7b5a7bd8cc9a5dffe7c03fd5ee13681de72635b72e9fb WHIRLPOOL 1c0cbc85fad821c5633a8dadcdf3b57d044e7df3f61d0460d4d644dfdcca186231583b1268d4e9abc078ecfcb0abfa7e0c047e6f9c43d9a595563c58b3ee2e25
 EBUILD pyfa-1.1.20.ebuild 2619 SHA256 01e4de655b01ab4f74435a48689d1d2e766582b35483ded05f83cf87232bd238 SHA512 48ee63fba64b1a01af2a910b7fcbe7d98bddda0ad851a96d3c8cef7c61f48a60237fafe18280f748a345f4320d2ba5ac2ba549a4f9b7488a31fa8c3a84cf7f69 WHIRLPOOL 3cd0a5dc749165d5531c01c03621c5c70e2bc7ce1febb9c0a7ca5b45c34c938ec5aa6aae9fea5d5dde833ea6d9c09c630d3dca44b6be4d89b09aa94da7a19790
+EBUILD pyfa-1.1.21.ebuild 2619 SHA256 fba2bf04f0ac42c31622181cc35a98db50ee8d6b0fe04df0b114c9472fdf7efe SHA512 e958632b44428753e25c4be195cf726818bb455bbfbcde5f4abce81098906865d5e64afcacc43415b889f1c0e4c93de11a565dad126ff3d6350be0c22241e1bb WHIRLPOOL e686134547112a6bde5c67a2072b0acb88d6c93b4de1b8e79149f95390003aac2fbfb7fd8517b2efa681ae92c62669faaf1d8eeeb301299460023e0414a33972
 EBUILD pyfa-9999.ebuild 2617 SHA256 f563fec5b262da7072654279fa8681cdaa7d0aa72dca5dcfca8257f305f9e3e2 SHA512 b8f9875bab7762db161a57283cebab90f73dcde6f98635f4dfcb5c791359d69d5afa12fc591aaf47e8374777c4a9191557d076913e6cfbc202dde49dd7736117 WHIRLPOOL 08577c48e74644ad37dca40e5ee9dcb693f204f4f8018fa4299795bd5c8ee84e0aba2a9c9fa6717da2c9114308bc74c73bb361d26ee6ccee8cb86add5484c618
-MISC ChangeLog 5631 SHA256 9f7d55bf73e566265fbb674bae70c7821c2256469e33f3ec42194b4d77d9f692 SHA512 6eb410159d9ad29da85a2ce4a241f9e1d6368dfeb69ab23b4d9340948c18b0ed742c991095e810a9f935682aa140b712a66a26d9ae23f53d491b7256f33b2359 WHIRLPOOL d54aa3df144c03de7f7f4e3e999ee17b4733da8d8dbc37178a5aeb21d437377fbe8d4d367e5e04f6d1c00867fb2e3f606676b2521efad0d76086365aa681014c
+MISC ChangeLog 5775 SHA256 39d72c34ad02282945a0d0da98e40e87e6113ef549b538d564b510c1449684e9 SHA512 9f6e092963009e775041973bb9d882b7a179735919c7e15ff109bc8e6cc648a99cea2d3f43a904ded39c8bef2801a22085d983574ac4775ac15240b061f03f5b WHIRLPOOL 6cc205d5439e2a1b440bcb2b42994abe303226c93b183a3fd0760d0ec1f5cc00fb88a5517f13fe1b82c0be72e1d4c3baea0075ad029e1c3ebdef6473243e4528
 MISC metadata.xml 595 SHA256 d156a4f7b850289a6d11948ef082c26cd67040d98bce8a9b7ac8ce6ec14c9eec SHA512 e1452ad7b29d102e5522de9fea0a47a239c04b21315a2d53ccc6bfc9fc92fde6968a48e95999c79ae464029a551f7d38a19b355b04129550e762f0ff1be33fa0 WHIRLPOOL 76db6e34117e8051e658ced61c1dc0c00b9ce8983f5fbc2fd198224f8101687222ecc934bac555cee5ce8f27dda1ff3f469dacd89ad91fe7125903fc7413f960
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS8dg9AAoJEJ0WA1zPCt1hz0EH/0+49oQxYW2UKjun6RJ/AAoX
-Ehsccr4lV9movYk057tiCtprcTJLDnHnRfQqm5+wUhR9QfbOm1mCibW/mUcSY5PY
-4AJsOwMMeuAsrXxg51lNC6UDvpSnN5zevST93LdvOjDxuR53u1Gn/pA/dEo8g9/r
-Fyu96ZGC8pktnkHflE2263QI45fKtQtltfZCz1eW5SUYh1bbtkfK7F2WRBRS3uFp
-/Hnf8BynCoiK/sT9vSCx5tYyLc6d7JZHplo3pHs+fg5z1jvJJnH+5FZuj9gTLeHD
-XIFUwVjDxKGBdaAWm+Ch/yvD7sMdWawkCDc5F7TbbiKDDCzISG7o2FgKyeBiuCg=
-=/UNj
+iQEcBAEBCAAGBQJTBXPJAAoJEJ0WA1zPCt1h4lcIAIhciXoTgxVGVjpB3OJvq3mn
+0Z28y/ovRD5dWZ/XTs81tOD4jkCXV01CtTZv224qPGmCClRl5Tq+rP2yMJ4+Fo0k
+Sdz/pc9Mr20sclV6j86h5HYqr2lovEN4UBE/EB6Fpk6iqcufMKSNUViYu4TaaKUA
+Brh7VnjWwzyCPKM9MxrTCHY/tiGgydv2nfgAIAhA3SenLstrFVD1BzliBkgLfdbF
+Z3R13MryI7gohGlVRFuIuOT59KDewIaYmENrmaEqKXCeKwwdR7StxqgKmHB7S0hZ
+rJqzrFkLqOE+ycVlWMHzW5fdGi2GKWBukKRzRub5cYB27zKoKY5n/rnHNIoUXb4=
+=SVDU
 -----END PGP SIGNATURE-----
diff --git a/games-util/pyfa/pyfa-1.1.21.ebuild b/games-util/pyfa/pyfa-1.1.21.ebuild
new file mode 100644
index 000000000000..80807a3f5c3d
--- /dev/null
+++ b/games-util/pyfa/pyfa-1.1.21.ebuild
@@ -0,0 +1,93 @@
+# 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.21.ebuild,v 1.1 2014/02/20 03:18:27 tetromino Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="sqlite,threads"
+
+inherit eutils gnome2-utils python-r1
+
+DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
+HOMEPAGE="https://github.com/DarkFenX/Pyfa"
+
+LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm"
+SLOT="0"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/DarkFenX/Pyfa.git"
+	inherit git-2
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/DarkFenX/Pyfa/releases/download/v${PV}/${P}-rubicon-1.1-src.zip"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+IUSE="+graph"
+
+RDEPEND="dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/wxpython:2.8[${PYTHON_USEDEP}]
+	graph? (
+		dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}] )
+	${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
+	edos2unix config.py pyfa.py service/settings.py
+
+	# make staticPath settable from configforced again
+	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"
+
+	# fix import path in the main script for systemwide installation
+	epatch "${FILESDIR}/${PN}-1.1.11-import-pyfa.patch"
+	touch __init__.py
+
+	pyfa_make_configforced() {
+		mkdir -p "${BUILD_DIR}" || die
+		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
+			-e "s:%%EPREFIX%%:${EPREFIX}:" \
+			"${FILESDIR}/configforced.py" > "${BUILD_DIR}/configforced.py"
+		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
+			pyfa.py > "${BUILD_DIR}/pyfa"
+	}
+	python_foreach_impl pyfa_make_configforced
+}
+
+src_install() {
+	pyfa_py_install() {
+		local packagedir=$(python_get_sitedir)/${PN}
+		insinto "${packagedir}"
+		doins -r eos gui icons service config*.py __init__.py gpl.txt
+		[[ -e info.py ]] && doins info.py # only in zip releases
+		doins "${BUILD_DIR}/configforced.py"
+		python_doscript "${BUILD_DIR}/pyfa"
+		python_optimize
+	}
+	python_foreach_impl pyfa_py_install
+
+	insinto /usr/share/${PN}
+	doins -r staticdata
+	dodoc readme.txt
+	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
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}