Version bump, see https://github.com/DarkFenX/Pyfa/releases/tag/v1.2.1 for the announcement.

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

3 files changed, 111 insertions, 10 deletions

diff --git a/games-util/pyfa/ChangeLog b/games-util/pyfa/ChangeLog
index ac8b719fc2d5..85ffb43aac6a 100644
--- a/games-util/pyfa/ChangeLog
+++ b/games-util/pyfa/ChangeLog
@@ -1,6 +1,12 @@
 # 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.28 2014/06/04 13:56:31 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/ChangeLog,v 1.29 2014/06/29 00:16:34 tetromino Exp $
+
+*pyfa-1.2.1 (28 Jun 2014)
+
+  28 Jun 2014; Alexandre Rostovtsev <tetromino@gentoo.org> +pyfa-1.2.1.ebuild:
+  Version bump, see https://github.com/DarkFenX/Pyfa/releases/tag/v1.2.1 for
+  the announcement.
 
 *pyfa-1.2.0 (04 Jun 2014)
 
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index 576557246894..f0625e83850c 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.2.0-kronos-1.0-src.zip 6346771 SHA256 bfead7da7449e873b7d85190db61198b66d6f09c8d45ee5eb7021509adf6ea32 SHA512 2d0a41107b9463a2ff14e30ff73d390953653e409ea41b92f8339ceb68d12d044b635a82f70ed2a5f64c3ddc2a1e9981f8f3e73a6b51619d514cd57d686af196 WHIRLPOOL fc1aec38c2e4857a5e3cd52d128cf5804b9df48bf59d842ea5a1c9be085c48b6a946c73ab6647037b2bc31817cd283d777bf8114030e7ead2d79ea7f1c755f64
+DIST pyfa-1.2.1-kronos-1.0-src.zip 6566198 SHA256 f6640942f0189c535992ce85e082f883a8eea156d24572c3364b70a46f3e1fe5 SHA512 44d0b0036ea36514786349352a4937d71377d43a036fa61b8bfcedd4b215fcac7e8ebcafc7b05dcf5b2a31fae949f3a31eee14f1d1f713c85c8e00fb3f96b3d0 WHIRLPOOL 751c5633b042f923175436b4282b33281f9052859514f83daefb724676ab6f4165ac04bd4a98538766d57250005218ed0bb9cbf05c145dcb588929c50cc701d0
 EBUILD pyfa-1.2.0.ebuild 2617 SHA256 34724bb9b6b3672cd928f460c9e7fd0ae1011c9ac22399525a2b635092431739 SHA512 4266ce61bd4b4eb5a2e8738ee1898ee7c1be4ed1d3deb56b1a7dd184765fbeea982ab107516bbc4dfe9034322d1ebb451310ca24ee0f807cfc9485ef152b81bb WHIRLPOOL 8006555a93e3f607de9051fdb037a3e41de74323a60f6527f2d934799d18b7f5560c2798535630257a6577587558c7008039ab3407283f844223f44c20dfc36c
+EBUILD pyfa-1.2.1.ebuild 2617 SHA256 decbe36d011d4caa1e97776a0744d658cf58d7d9cff45e9db6f3d68d9c3d7969 SHA512 6e7fe5a1541f8a63a0221809fa0799a7eed0ea00f3a68aacb7612f2b3ddb8d3cf1b386bfa8bcf692b2b58c50871c3a8b3d08cdd72efe49ecc2c0bba98352aead WHIRLPOOL 6497c275fc31c93b929ae0ea510c036eaf03d1defa4f3bf3fe50f08b1a406736df5d7c9aae54a690c2ce0189a86c4925b461b70827f698cfaf04e2d43aa89b4d
 EBUILD pyfa-9999.ebuild 2616 SHA256 0fbecf7f2b4800e4fd93d840a8da8da02a65bc9d3d9ac33327ef79c9d5f3f5d5 SHA512 caf5d52fb96bac0616d2a328e5f4372e1996a9f0e443c78c467259a29ff8792f1617dca6f1babc302771662981d148013b5a757ffa2cedb97387513442b898e3 WHIRLPOOL b9f1a1e100e8d63e9bbd0ab4a450283ff031c7faf3a0b5fbd37796caccebe708c0183e5893bd26323c0fce441ca8c4a979a08468764c6a7b2a60826e62f4bbfb
-MISC ChangeLog 6310 SHA256 ff8e7122bdbaea0201f1f55de7056a8bb5cc4f64c83b4e12de0ae1c418eb0f45 SHA512 0bad66817df520bc4571596e99f8d57051ff6b570283eca767236936b064199ba2f3628497242b0aa3cdad64379e2bbb4027e11820395150d7ced78a9f42121d WHIRLPOOL b309ce26c3affef344de361a6ede091a64f0671f7e6ff9531d5a81bbdd70c48a62a24abc7a6ef8b52cc4e058055e4e2d283aec44a624bb6aecf24a2e128cf403
+MISC ChangeLog 6514 SHA256 922ecfaa16271a0fbe714b2e4eba5e4a0eec17dde5c91c7874d8c963695cda18 SHA512 57eaed90f0b3e34278b73de6784c0ef747bece88f2a5bfde64264074f830a542a29239f40019feec92d07787b3d67d61464d9662a44e02031e1b9459ef416f15 WHIRLPOOL d03083baca1ea6ca68a77b8c27dc006edef0daf6f1643580bcd8008492172de831ff213dd5aed2ebfb61132d124fe1c74e90b43da7d619868594b76cfd3cc3d3
 MISC metadata.xml 595 SHA256 d156a4f7b850289a6d11948ef082c26cd67040d98bce8a9b7ac8ce6ec14c9eec SHA512 e1452ad7b29d102e5522de9fea0a47a239c04b21315a2d53ccc6bfc9fc92fde6968a48e95999c79ae464029a551f7d38a19b355b04129550e762f0ff1be33fa0 WHIRLPOOL 76db6e34117e8051e658ced61c1dc0c00b9ce8983f5fbc2fd198224f8101687222ecc934bac555cee5ce8f27dda1ff3f469dacd89ad91fe7125903fc7413f960
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTjyVkAAoJEJ0WA1zPCt1hLgIH/jAkS3gyaO7C22O0I+Wuu+T0
-LfUaJX16gpbrtmMuugDgZEceYzx+GsKlTL3EWJTDaqsJhCz+xEJnki/Uvs/Ctein
-guRbFuTSPP1AjJb/PzF9iVjj+qWGUtf4+oyux6+odUzKbvnoKUB3TaqRZJhklfbw
-F1uukOY8nd7JEu3jaq9dT1jtVhVyCWDZ1D7QS9dQhwII+CuD2h6pvPocMjLEc776
-GTFg6b7yHwyhWATgZM6DZQSElnyK5mdpEcipoKpXXBJ+nwU9a+XRjrpC3si/1gDA
-KE74L9dg+C34THg1jS/lEwDyWPnkFqXjYgcodhQPGepmJt57bd77Jd9GcJsoQw8=
-=kvVb
+iQEcBAEBCAAGBQJTr1qcAAoJEJ0WA1zPCt1hqHQIAIq84MWXt03AlqGfi0jYxntm
+RBuomMFi3OfK+H3g2GVVJYmg/9jrYCFbFZ8VACV65Ab5Jii2rll6rYa5SpqoDxZQ
+Twck7vpRxv4FeC1PfCW42WjPcQ8lbucSEGE6MRlkh0FaSxXGKlwVDnFJKolMq4lX
+BMjGJvEKrjfHND84oT4oLuiEqhC5RBvwnUQbctswZdARkYN72KN0uy2LqOp9O1l7
+cRqIGtVCBcAfbCjOustAPURNVSM304G50aLTTekotwbqdxH4XnMEAf2oXQR8TWsd
+gXdv4teMttkMLxE4t8l12NxjWcCMPmCAG5sdWZLhbygdeapKXNIEG/8iiGRjrEg=
+=xxfV
 -----END PGP SIGNATURE-----
diff --git a/games-util/pyfa/pyfa-1.2.1.ebuild b/games-util/pyfa/pyfa-1.2.1.ebuild
new file mode 100644
index 000000000000..95a5a58561a2
--- /dev/null
+++ b/games-util/pyfa/pyfa-1.2.1.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.2.1.ebuild,v 1.1 2014/06/29 00:16:34 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}-kronos-1.0-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
+}