Pyfa only supports wxpython:2.8. Fix dependency, add patch to select correct slot of wxpython at runtime, and drop broken versions. Thanks to Samuli Suominen for noticing.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

5 files changed, 60 insertions, 89 deletions

diff --git a/games-util/pyfa/ChangeLog b/games-util/pyfa/ChangeLog
index 13f81e19af62..bb73e3ed2a2f 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.7 2012/03/21 21:13:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/ChangeLog,v 1.8 2012/03/21 22:45:57 tetromino Exp $
+
+*pyfa-1.1.4-r1 (21 Mar 2012)
+
+  21 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org> -pyfa-1.1.3.ebuild,
+  -pyfa-1.1.4.ebuild, +pyfa-1.1.4-r1.ebuild, +files/pyfa-1.1.4-wxversion.patch:
+  Pyfa only supports wxpython:2.8. Fix dependency, add patch to select correct
+  slot of wxpython at runtime, and drop broken versions. Thanks to Samuli
+  Suominen for noticing.
 
 *pyfa-1.1.4 (21 Mar 2012)
 
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index 168f648bc072..1f01cfea1f43 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -3,17 +3,16 @@ Hash: SHA256
 
 AUX configforced.py 144 RMD160 defbe8a6b64ac742062d73df87e6b71b76ad53ab SHA1 fb159ffed205b303dd9bc0e18c65fd2436af377a SHA256 289eaf04b78739937b6d4e0c144136a9c8174d59a98304cb52dbcae6a28dda66
 AUX pyfa-1.1-staticPath.patch 979 RMD160 81a30a7a812a05d8e37dd7460983c60858a01452 SHA1 f893c976783dc324fb4f8182495dc1bc578b2a2a SHA256 2efdd1a18271f919553c03e37e3552805e18cd6dee4fd0fc310bb315f3616d92
+AUX pyfa-1.1.4-wxversion.patch 1290 RMD160 e44ce67eccda79d7ed986e24a1f787b0b15fc341 SHA1 ca7b8d5581bc57d0833a8599eae90a863e04372f SHA256 5bcd443238fa6b9c02861e7c16c2f2c9b297aee9400c6ebd4844280252e06dce
 AUX pyfa.desktop 155 RMD160 37f31fe5d62b2690b7761babb0dfeb8c0171ae80 SHA1 cb3a43b949524de9692f323cda9e7adad2efe218 SHA256 c395891d87eaaac64e3ba7954d623efaf161d906527099ed4b0c680c63a041eb
-DIST pyfa-1.1.3-crucible-src.tar.bz2 3918655 RMD160 768be5be520b4a4515a1944588b784ef2b45495b SHA1 1dcf5cab833e0b739cce8b58686f4b3209a85507 SHA256 ad0ab1589cdd5b2783781e27f789c119883cef59437234aeaabea1f71c84b5d8
 DIST pyfa-1.1.4-crucible-src.tar.bz2 3926243 RMD160 56a8b7a376a203b37bef393f376d8800c23113e5 SHA1 178fecb02b1ea6d6b83a03102cc3c8ad9cc2417f SHA256 e7ddd071d7f2c7b2794e0bece1964b4763ddcc8ba1d84f9f9736552897672674
-EBUILD pyfa-1.1.3.ebuild 1939 RMD160 9b77fa7451be6b5f31bb79db15e6a92fc5f97410 SHA1 ffd398b4ef55c9f734365cdaeb2410b70ccba172 SHA256 fe3d5e93a6216e585721062b2981375a3c9be0b2fe80e8078952af7d338eb0b1
-EBUILD pyfa-1.1.4.ebuild 1939 RMD160 704c5a76cb2975a59dd64ee6be89f3aae71b54b9 SHA1 14d897164428809aee8d13403667132dec16d5d9 SHA256 f4825ab4ba9d4cb73afdce513e61bbdf261bc1279eec2049f1d1759923794c4e
-MISC ChangeLog 1539 RMD160 e1ffe527d191f3d57d1703dce9a7fa2eb1c5bd72 SHA1 1ffeae16d7412a31c668cb0b68165b23c8ff61cb SHA256 9804f6333d53d4a2e39aadd7fe4d973dc6cd2aaba86fd105b6547cd1728a9ef7
+EBUILD pyfa-1.1.4-r1.ebuild 2058 RMD160 87517e49731a13dbdd4dfa98ce36727bab9a02cb SHA1 bec4aabf701cf45f2e46a7a25b59b3b74e47b39c SHA256 91723bdbe3c77d1e30fc04a16cb68b5f8894de219eeb2ccc91f9cb173950e82c
+MISC ChangeLog 1907 RMD160 b31b7ff5ed05dbca6c091498adb8cb334cf9915e SHA1 2e33371d2a390e17f19378bdaebf14cd07adf7a3 SHA256 f9deb85ae6099da93ab70aa543a14479e49f29341127986039f15f0161811538
 MISC metadata.xml 595 RMD160 6d804a6ba1ac41e068bb525bdfbf102557f48d9a SHA1 916ecfe82fc370f9d58d17e5bfe00c5b2ebc8719 SHA256 d156a4f7b850289a6d11948ef082c26cd67040d98bce8a9b7ac8ce6ec14c9eec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk9qRIMACgkQdjK8w9WeBnAGiwD/fDfs11K0eh+GpzeoqCKEwbfg
-t9NGXWa9OCxvFu7RF2wA/29hVy2nORrrT8bHeNVpnFGI6R8b0qdz47tLAo1YyzLK
-=ObyR
+iF4EAREIAAYFAk9qWisACgkQdjK8w9WeBnB9bwD8DJl+jVjQqm9kO70FnonGnGP+
+4rnKWw3+iApW+br4T/YBAIkBKo/+qRoMfQ3NuMqa7D7wF0sGHhL8ZlJrLNw12LVV
+=ywA5
 -----END PGP SIGNATURE-----
diff --git a/games-util/pyfa/files/pyfa-1.1.4-wxversion.patch b/games-util/pyfa/files/pyfa-1.1.4-wxversion.patch
new file mode 100644
index 000000000000..624068b2bc9d
--- /dev/null
+++ b/games-util/pyfa/files/pyfa-1.1.4-wxversion.patch
@@ -0,0 +1,40 @@
+From 6971971729dbbea1db8c1006c99b1035f30214a2 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 21 Mar 2012 18:24:26 -0400
+Subject: [PATCH] Use wxversion.select('2.8') to support systems that have
+ wxpython-2.9 installed
+
+Pyfa-1.x supports only wxpython-2.8, but multiple wxpython versions can
+be installed in parallel, and by default, 'import wx' pulls in the
+latest one.
+
+To support systems that have both wxpython-2.8 and 2.9 installed, pyfa
+needs to call wxversion.select.
+
+Note that wxversion.select can potentially fail with several exceptions
+internal to the wxversion module, so for simplicity, just check for all
+of them with an 'except:'.
+
+http://trac.evefit.org/ticket/475
+---
+ pyfa.py |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pyfa.py b/pyfa.py
+index aedb718..6992aaf 100755
+--- a/pyfa.py
++++ b/pyfa.py
+@@ -29,8 +29,8 @@ if not hasattr(sys, 'frozen'):
+ 
+     try:
+         import wxversion
+-        wxversion.ensureMinimal('2.8')
+-    except ImportError:
++        wxversion.select('2.8')
++    except:
+         print "Cannot find wxPython or the installed wxPython version doesn't meet the min. requirements.\nYou can download wxPython (2.8) from http://www.wxpython.org/"
+         sys.exit(1)
+ 
+-- 
+1.7.8.5
+
diff --git a/games-util/pyfa/pyfa-1.1.3.ebuild b/games-util/pyfa/pyfa-1.1.4-r1.ebuild
index 3f4180909d5d..df5f6a4f60b2 100644
--- a/games-util/pyfa/pyfa-1.1.3.ebuild
+++ b/games-util/pyfa/pyfa-1.1.4-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.3.ebuild,v 1.1 2012/03/14 06:41:11 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.4-r1.ebuild,v 1.1 2012/03/21 22:45:57 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -26,7 +26,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+graph"
 
 RDEPEND="dev-python/sqlalchemy
-	>=dev-python/wxpython-2.8
+	dev-python/wxpython:2.8
 	graph? ( dev-python/matplotlib[wxwidgets] dev-python/numpy )"
 DEPEND=""
 
@@ -41,6 +41,9 @@ 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"
+
 	python_convert_shebangs -r -x 2 .
 	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
 		-e "s:%%EPREFIX%%:${EPREFIX}:" \
diff --git a/games-util/pyfa/pyfa-1.1.4.ebuild b/games-util/pyfa/pyfa-1.1.4.ebuild
deleted file mode 100644
index a502b62403a2..000000000000
--- a/games-util/pyfa/pyfa-1.1.4.ebuild
+++ /dev/null
@@ -1,79 +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.4.ebuild,v 1.1 2012/03/21 21:13:33 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}-crucible-src
-	FOLDER=stable/${PV}
-else
-	MY_PV=${PV/_rc/-stable-RC}-src
-	FOLDER=stable/${PV/*_rc/RC}
-fi
-
-DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="http://www.evefit.org/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 )"
-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"
-
-	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}
-}