Bump, adds Retribution 1.0 updates (bug #446030, thanks to Matthew Marlowe). Update to EAPI5 and python-r1.eclass. Drop old.

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

5 files changed, 144 insertions, 97 deletions

diff --git a/games-util/pyfa/ChangeLog b/games-util/pyfa/ChangeLog
index 77b64b840dbc..2688375ba2dc 100644
--- a/games-util/pyfa/ChangeLog
+++ b/games-util/pyfa/ChangeLog
@@ -1,6 +1,14 @@
 # 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.15 2012/11/23 10:45:16 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/ChangeLog,v 1.16 2012/12/05 05:53:15 tetromino Exp $
+
+*pyfa-1.1.11 (05 Dec 2012)
+
+  05 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -pyfa-1.1.9-r1.ebuild, +pyfa-1.1.11.ebuild,
+  +files/pyfa-1.1.11-import-pyfa.patch:
+  Bump, adds Retribution 1.0 updates (bug #446030, thanks to Matthew Marlowe).
+  Update to EAPI5 and python-r1.eclass. Drop old.
 
 *pyfa-1.1.10 (23 Nov 2012)
 
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index f69c6233332c..a69913d4d6aa 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -3,23 +3,24 @@ 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.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.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
+DIST pyfa-1.1.11-retribution-1.0-src.tar.bz2 4870595 SHA256 71af17ddb20b9432c643ad21d2d54ab2bba027ac9f2d143f4f542794f95567d2 SHA512 f8d423f00e53dc026e06cf5af11428f68784a7ca32283a08ca7e18c3a64ffd0a782002956f2bf2ec97272e783e46762956c57e4b7c92d56edd52348e8c2ab4ff WHIRLPOOL f6ac0c3848937cc3e3d0e74cc916fa6bb42ad0510227129a4719b6076b6fc0f58e1a18f65422236ffc59406267ea15bb93931ac4db16d12577fbeb4f4b205daf
 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
+EBUILD pyfa-1.1.11.ebuild 2662 SHA256 ceee339e193d2a1ec9b580193561afdfd3e6f7abe708adaa669197b8db8f1a6e SHA512 23b10b1a1c65d34d2bcc139aeb971a5474a749a905152d4cdfa4b7b8f2b4d90265e213c5c91903b54adad6d1b4520169078e39967978ed88bda6d2f1d8ef6585 WHIRLPOOL f1bd44894f8d1d100dfcd309d771bcd5394dce36d3b00b822680305f1946b1b18e75569dfc8ae9a3f6249766c6904400694b552804b478a2db7785fbfb77bfed
+MISC ChangeLog 3629 SHA256 bc1172cb86d6086e7ee7554984fc06e651927052142e3e5573a2e1feb8265803 SHA512 b8544dd2d987e65242dc92f98bfc55f3f6e1458250c0d860ddf1354298f98ea1d1690eb691313b40fa6d8e578fbb9914cd15a10b3e5b8728167c95c4178fb54e WHIRLPOOL 6679428f74e1a0bf9c0696995758748ddc5118707a6c2a25acd5af2c6f7a306046b14e7ab8e1fccfc68b556bfaf9e9bbd90ce94af236623a078b6d64c2d4ebde
 MISC metadata.xml 595 SHA256 d156a4f7b850289a6d11948ef082c26cd67040d98bce8a9b7ac8ce6ec14c9eec SHA512 e1452ad7b29d102e5522de9fea0a47a239c04b21315a2d53ccc6bfc9fc92fde6968a48e95999c79ae464029a551f7d38a19b355b04129550e762f0ff1be33fa0 WHIRLPOOL 76db6e34117e8051e658ced61c1dc0c00b9ce8983f5fbc2fd198224f8101687222ecc934bac555cee5ce8f27dda1ff3f469dacd89ad91fe7125903fc7413f960
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQr1O9AAoJEJ0WA1zPCt1hT8wIALeF6L7Y3PACIIBKYpNyPC6V
-UOBmDBAUpXtPbneDQ8EouCFGGQCz015ul6l62anx+r1BPeRfS8lOqQbx0PETFzbS
-kfP2fG7dgm6TWBJEnmyItJw9QBtOeyQVOe89u95CKlffn9TZlufQeCkz7Th3WmZQ
-/KY2+BVEXUj2yIP7ihd5V5Dlv84YnJSdgC5gEuLwoh0poH72EITON+6QVR5g363t
-rdZGx+LCmkApmTWHLdPqTq/74B8bAhy5OiyTIuPxCUGOxJ1gBRB+rsSEiXu6p5XE
-BgsuakLeNFpQFANhwqhCVHDEcqiNYjyDQ/Cm0Foj22gI/2j3C/bV9hcDnqP2334=
-=ee70
+iQEcBAEBCAAGBQJQvuFNAAoJEJ0WA1zPCt1hOpEH/3M/hLlD2CDFQPImXTaLquMP
+CGAbTmDWPpTbgHnFYHRpsi3S7M9BI6cZUWRV62r39RkSzAHIp6ZXQZyj3wAqBeFM
+c1L+CJzqoZ666qvXHAmI1/vJSFpOjiqds3F3V3bj/Wzpn7Ljz9Al6AvDmmRj38HP
+BjFgEGIr0tqqNIQomoxhLye0ZZES+XCL3lfYjTpZFCPPDSGYxmeQARxUNRxp8ctn
+oe9CNVGWX06cU/QitMxC1UZ1CnSLuiuGJPqVn5fMTeIj1ZO7OAAHFshgX2tIe3OS
+PjU3WjNq2b8t2RP4p/CvMEfUybDEaWjk7l2jWkMW1aJ/it9K7P/mTpQICH3THwg=
+=6vEP
 -----END PGP SIGNATURE-----
diff --git a/games-util/pyfa/files/pyfa-1.1.11-import-pyfa.patch b/games-util/pyfa/files/pyfa-1.1.11-import-pyfa.patch
new file mode 100644
index 000000000000..8269080038f9
--- /dev/null
+++ b/games-util/pyfa/files/pyfa-1.1.11-import-pyfa.patch
@@ -0,0 +1,28 @@
+From f301dcd0df741514e889fc234811cd4770dca6c7 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 5 Dec 2012 00:48:12 -0500
+Subject: [PATCH] Append $(python_get_sitedir)/pyfa to import path
+
+Ensures that pyfa's import statements continue to work for systemwide
+installation.
+---
+ pyfa.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/pyfa.py b/pyfa.py
+index 6992aaf..d66cb70 100755
+--- a/pyfa.py
++++ b/pyfa.py
+@@ -63,6 +63,9 @@ if __name__ == "__main__":
+     parser.add_option("-r", "--root", action="store_true", dest="rootsavedata", help="if you want pyfa to store its data in root folder, use this option", default=False)
+     (options, args) = parser.parse_args()
+ 
++    import os
++    sys.path.append(os.path.join("%%SITEDIR%%", "pyfa"))
++
+     import config
+     # Configure paths
+     if options.rootsavedata is True:
+-- 
+1.8.0
+
diff --git a/games-util/pyfa/pyfa-1.1.11.ebuild b/games-util/pyfa/pyfa-1.1.11.ebuild
new file mode 100644
index 000000000000..0d723c89c0c7
--- /dev/null
+++ b/games-util/pyfa/pyfa-1.1.11.ebuild
@@ -0,0 +1,96 @@
+# 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.11.ebuild,v 1.1 2012/12/05 05:53:16 tetromino Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="sqlite,threads"
+
+inherit eutils gnome2-utils python-r1
+
+if [[ ${PV/_rc*/} == ${PV} ]] ; then
+	MY_PV=${PV}-retribution-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"
+
+LICENSE="GPL-3+ LGPL-2.1+ CCPL-Attribution-2.5 free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+graph"
+
+RDEPEND="dev-python/sqlalchemy
+	dev-python/wxpython:2.8
+	graph? ( dev-python/matplotlib[wxwidgets] dev-python/numpy )
+	${PYTHON_DEPS}"
+DEPEND="app-text/dos2unix
+	${PYTHON_DEPS}"
+
+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
+
+	# make staticPath settable from configforced again
+	epatch "${FILESDIR}/${PN}-1.1-staticPath.patch"
+
+	# use correct slot of wxpython, http://trac.evefit.org/ticket/475
+	epatch "${FILESDIR}/${PN}-1.1.4-wxversion.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 info.py __init__.py gpl.txt
+		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
+}
diff --git a/games-util/pyfa/pyfa-1.1.9-r1.ebuild b/games-util/pyfa/pyfa-1.1.9-r1.ebuild
deleted file mode 100644
index c6cf92d432e1..000000000000
--- a/games-util/pyfa/pyfa-1.1.9-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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.2 2012/11/23 10:45:16 tetromino Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.6"
-PYTHON_USE_WITH="sqlite threads"
-
-inherit eutils gnome2-utils python
-
-if [[ ${PV/_rc*/} == ${PV} ]] ; then
-	MY_PV=${PV}-inferno-1.2-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 -> pyfa-1.1.9-inferno-1.2-src-r1.tar.bz2"
-
-LICENSE="GPL-3+ LGPL-2.1+ CCPL-Attribution-2.5 free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+graph"
-
-RDEPEND="dev-python/sqlalchemy
-	dev-python/wxpython:2.8
-	graph? ( dev-python/matplotlib[wxwidgets] dev-python/numpy )"
-DEPEND=""
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# make staticPath settable from configforced again
-	epatch "${FILESDIR}/${PN}-1.1-staticPath.patch"
-
-	# use correct slot of wxpython, http://trac.evefit.org/ticket/475
-	epatch "${FILESDIR}/${PN}-1.1.4-wxversion.patch"
-
-	# do not try to save exported html to python sitedir
-	epatch "${FILESDIR}/${PN}-1.1.8-html-export-path.patch"
-
-	chmod 755 pyfa.py || die "chmod failed"
-	python_convert_shebangs -r -x 2 .
-	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-		-e "s:%%EPREFIX%%:${EPREFIX}:" \
-		"${FILESDIR}/configforced.py" > configforced.py
-}
-
-src_install() {
-	local packagedir=$(python_get_sitedir)/${PN}
-	insinto "${packagedir}"
-	doins -r eos gui icons service config*.py info.py gpl.txt
-	exeinto "${packagedir}"
-	doexe ${PN}.py
-	dosym "${packagedir}/${PN}.py" /usr/bin/${PN}
-	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
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	python_mod_cleanup ${PN}
-}