Bump, adds Retribution 1.0.2 updates. Drop old.

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

3 files changed, 50 insertions, 37 deletions

diff --git a/games-util/pyfa/ChangeLog b/games-util/pyfa/ChangeLog
index 2688375ba2dc..f40dc20d83b9 100644
--- a/games-util/pyfa/ChangeLog
+++ b/games-util/pyfa/ChangeLog
@@ -1,6 +1,12 @@
 # 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.16 2012/12/05 05:53:15 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/ChangeLog,v 1.17 2012/12/09 21:37:27 tetromino Exp $
+
+*pyfa-1.1.12 (09 Dec 2012)
+
+  09 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> -pyfa-1.1.10.ebuild,
+  +pyfa-1.1.12.ebuild:
+  Bump, adds Retribution 1.0.2 updates. Drop old.
 
 *pyfa-1.1.11 (05 Dec 2012)
 
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index a69913d4d6aa..8427bd8d61b1 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.10-inferno-1.2-src.tar.bz2 4312159 SHA256 e611708967d9af491b5878acf31f72addc585176408667e7edbf5e26f9122103 SHA512 7896e2d2e9b9a3893843136218c76a57f2e2d8a3b80753c9501437ac0e599298c6321f325ea69cb71ee8212068aa6ba4459bd664c7b306211cfe3cd5333b4932 WHIRLPOOL 3be308740ed6c62ccf415e50a31fb7a331544bb1d4f945e714034955a6bfcae760a45d445e1707e015655580280708297b08ae04019ddbb797e6c67cdc838242
 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
+DIST pyfa-1.1.12-retribution-1.0.2-src.tar.bz2 4915932 SHA256 fc6af714012ad26d9b4d86c46554ae1a17abd7f854b39410ed8b3ae271497266 SHA512 00ab60ff6a94df183a2f68d51fd8f23cb33f5dd66bdd4e492ad09db4715a70c5ea3fc9d06c7c856e3e3480e543bc6803d42f440f822399ffdb4e583abaa397a0 WHIRLPOOL d0439bc9bef969ad665653b0438871e6837a8092c2364afdb9f1685e4636b2d69f72b664772d865cc30e563abfc30365e3e394b51131193ef4cdd283ef1c4a1c
 EBUILD pyfa-1.1.11.ebuild 2662 SHA256 ceee339e193d2a1ec9b580193561afdfd3e6f7abe708adaa669197b8db8f1a6e SHA512 23b10b1a1c65d34d2bcc139aeb971a5474a749a905152d4cdfa4b7b8f2b4d90265e213c5c91903b54adad6d1b4520169078e39967978ed88bda6d2f1d8ef6585 WHIRLPOOL f1bd44894f8d1d100dfcd309d771bcd5394dce36d3b00b822680305f1946b1b18e75569dfc8ae9a3f6249766c6904400694b552804b478a2db7785fbfb77bfed
-MISC ChangeLog 3629 SHA256 bc1172cb86d6086e7ee7554984fc06e651927052142e3e5573a2e1feb8265803 SHA512 b8544dd2d987e65242dc92f98bfc55f3f6e1458250c0d860ddf1354298f98ea1d1690eb691313b40fa6d8e578fbb9914cd15a10b3e5b8728167c95c4178fb54e WHIRLPOOL 6679428f74e1a0bf9c0696995758748ddc5118707a6c2a25acd5af2c6f7a306046b14e7ab8e1fccfc68b556bfaf9e9bbd90ce94af236623a078b6d64c2d4ebde
+EBUILD pyfa-1.1.12.ebuild 2664 SHA256 1c6ea9f2f2241c3856b180fc8d04828709d1b3d49f1425ebf0c967b23d5eead6 SHA512 8a5b446e2486ad5c33292cf3417e1a4782e64e18b158c52a17734d3309a32d3adf0437f9ccc717264030ba9c2bf10568a67a0029c30758a4a5fccb46764faf87 WHIRLPOOL 225a2e9bcde2ef71df7cb392e44e18656e29e1e4f52360c6b902ccff58cb0c3b285090a22d908020d9df8853d78bde31c8cfb8356929abfabd94cb1d13b60269
+MISC ChangeLog 3811 SHA256 75c5683ef39ceaff45a34401413555298f0277bff300f021db8c0c713ea98810 SHA512 f0183df9fa27f34c17f0422b93ad5a22e5c21599b69fd7147871453b62c0e336f28153f9bd74a3a0a1d436f5cfa73e75273a19e3326083bf482c45c47cf41960 WHIRLPOOL 9fcb534a1ba99126ef128516c30c186a12afe2dd0bf95f458eca5aa82606afa45ac7b07b037dabfcd73d4c301ebd8ed0b62b23e4bac3d14cd29c3d950b88fc23
 MISC metadata.xml 595 SHA256 d156a4f7b850289a6d11948ef082c26cd67040d98bce8a9b7ac8ce6ec14c9eec SHA512 e1452ad7b29d102e5522de9fea0a47a239c04b21315a2d53ccc6bfc9fc92fde6968a48e95999c79ae464029a551f7d38a19b355b04129550e762f0ff1be33fa0 WHIRLPOOL 76db6e34117e8051e658ced61c1dc0c00b9ce8983f5fbc2fd198224f8101687222ecc934bac555cee5ce8f27dda1ff3f469dacd89ad91fe7125903fc7413f960
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQvuFNAAoJEJ0WA1zPCt1hOpEH/3M/hLlD2CDFQPImXTaLquMP
-CGAbTmDWPpTbgHnFYHRpsi3S7M9BI6cZUWRV62r39RkSzAHIp6ZXQZyj3wAqBeFM
-c1L+CJzqoZ666qvXHAmI1/vJSFpOjiqds3F3V3bj/Wzpn7Ljz9Al6AvDmmRj38HP
-BjFgEGIr0tqqNIQomoxhLye0ZZES+XCL3lfYjTpZFCPPDSGYxmeQARxUNRxp8ctn
-oe9CNVGWX06cU/QitMxC1UZ1CnSLuiuGJPqVn5fMTeIj1ZO7OAAHFshgX2tIe3OS
-PjU3WjNq2b8t2RP4p/CvMEfUybDEaWjk7l2jWkMW1aJ/it9K7P/mTpQICH3THwg=
-=6vEP
+iQEcBAEBCAAGBQJQxQSYAAoJEJ0WA1zPCt1hefcH/jBeecJS6km0SHiov9/aIEw9
+b2VmQOHtYa8hB09wHTOE2bIM9UDpS9j6YhyvtmZInj1aB+m1bb23I4pl4Y2sJPra
++8LmJOUHnEIaZUuyZCsQBQrNAYOY9rX/zDBsLefeFKaBg8wUGAOEUIrniKVsxt+p
+czVAnMwh7O6j6QTpFaE1DONGpcnlvb2/mSKZXIM4HqBK0ACc4dQrUUHnXdoi86ci
+Fa7xXinZQ5tVW+LSK+Bw6IoYzLzCTKK+liJdjK7odfwxvgIp18/0ooU09QOnyQgp
++ewAJvaYFlFWV7eVHlnJ+zu+HLInhX6D4EZ5zIDGogVGftRriUGg/vGByYrZhhw=
+=jd/+
 -----END PGP SIGNATURE-----
diff --git a/games-util/pyfa/pyfa-1.1.10.ebuild b/games-util/pyfa/pyfa-1.1.12.ebuild
index eb3e8090f648..ee844a9084e4 100644
--- a/games-util/pyfa/pyfa-1.1.10.ebuild
+++ b/games-util/pyfa/pyfa-1.1.12.ebuild
@@ -1,15 +1,15 @@
 # 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.10.ebuild,v 1.1 2012/11/23 10:45:16 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.12.ebuild,v 1.1 2012/12/09 21:37:27 tetromino Exp $
 
-EAPI="4"
-PYTHON_DEPEND="2:2.6"
-PYTHON_USE_WITH="sqlite threads"
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="sqlite,threads"
 
-inherit eutils gnome2-utils python
+inherit eutils gnome2-utils python-r1
 
 if [[ ${PV/_rc*/} == ${PV} ]] ; then
-	MY_PV=${PV}-inferno-1.2-src
+	MY_PV=${PV}-retribution-1.0.2-src
 	FOLDER=pyfa/stable/${PV}
 else
 	MY_PV=${PV/_rc/-stable-RC}-src
@@ -27,16 +27,13 @@ IUSE="+graph"
 
 RDEPEND="dev-python/sqlalchemy
 	dev-python/wxpython:2.8
-	graph? ( dev-python/matplotlib[wxwidgets] dev-python/numpy )"
-DEPEND="app-text/dos2unix"
+	graph? ( dev-python/matplotlib[wxwidgets] dev-python/numpy )
+	${PYTHON_DEPS}"
+DEPEND="app-text/dos2unix
+	${PYTHON_DEPS}"
 
 S=${WORKDIR}/${PN}
 
-pkg_setup() {
-	python_set_active_version 2
-	python_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
@@ -50,20 +47,32 @@ src_prepare() {
 	# 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
+	# 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() {
-	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}
+	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
@@ -80,10 +89,8 @@ pkg_preinst() {
 
 pkg_postinst() {
 	gnome2_icon_cache_update
-	python_mod_optimize ${PN}
 }
 
 pkg_postrm() {
 	gnome2_icon_cache_update
-	python_mod_cleanup ${PN}
 }