games-util/pyfa: Version bump. Adjust SRC_URI logic again (for some reason upstream *loves* changing it). Require python built with threads. Add a patch to allow setting staticPath from configforced again (like in 1.0_rc2) so that we can keep a sane filesystem layout.

svn path=/sunrise/; revision=12235

4 files changed, 34 insertions, 7 deletions

diff --git a/games-util/pyfa/ChangeLog b/games-util/pyfa/ChangeLog
index be1e6c91c..27b5d0302 100644
--- a/games-util/pyfa/ChangeLog
+++ b/games-util/pyfa/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Jul 2011; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
+  -pyfa-1.0_rc2.ebuild, +pyfa-1.0.3.ebuild,
+  +files/pyfa-1.0.3-staticPath.patch:
+  Version bump. Adjust SRC_URI logic again (for some reason upstream *loves*
+  changing it). Require python built with threads. Add a patch to allow
+  setting staticPath from configforced again (like in 1.0_rc2) so that we can
+  keep a sane filesystem layout.
+
   19 May 2011; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
   pyfa-1.0_rc2.ebuild:
   Adjust license: eve.db and contents of staticdata directory are derived from
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index 8d0c6f034..294b94d75 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -1,6 +1,7 @@
 AUX configforced.py 141 RMD160 97aa3025140ad05588f294a723b5e0c53620aa0a SHA1 4b162c62ab09a1f7186cb71b416181ab7a545c73 SHA256 3a2b219182419888548bd0981ffa2bacb2a5f059ea00e3327b1bdd83ad1076bc
+AUX pyfa-1.0.3-staticPath.patch 614 RMD160 97ed39cc2522781d14e0c49dce0a8a79a382cbf8 SHA1 c9b280716b1d7a12f272c4b991a4ceca1aef7099 SHA256 eae228f31928750be19950a9268d5fe233a108b5af4eab436aa4db0fb5e5bab1
 AUX pyfa.desktop 155 RMD160 37f31fe5d62b2690b7761babb0dfeb8c0171ae80 SHA1 cb3a43b949524de9692f323cda9e7adad2efe218 SHA256 c395891d87eaaac64e3ba7954d623efaf161d906527099ed4b0c680c63a041eb
-DIST pyfa-1.0-stable-RC2-src.tar.bz2 5608540 RMD160 5bf466cfda3217928b75d45bd9a10b963a1bb64a SHA1 703c37b714121f73d56f3d9f4d53d3bbe493ce1c SHA256 48bea3935cb430b78450cbefb65b89e69e668f9effd4307c841282eafc3fdf83
-EBUILD pyfa-1.0_rc2.ebuild 1581 RMD160 44a691cd2b897e9006b49bd924346a4ea0b6b229 SHA1 03545525ee2b2946de0c580e59b404d7f61fee6f SHA256 9f2ec8457b835a3dc218db69ceefed5056d41ae5a59236775c4a220a6e039888
-MISC ChangeLog 1011 RMD160 fef5bba27e89748fadc438dc09dfa8883aa9ff38 SHA1 02ce2939b19e2bc7c9eab96b626a9ddb34786b94 SHA256 ea686b40f9fd4ed00af6b8142e3592bcc63e0fdcfde880508c0d489ccd9c0b25
+DIST pyfa-1.0.3-incarna-src.tar.bz2 5653052 RMD160 3060aab58bc7a78c315e67084f064e517e6e1276 SHA1 cba6896c382879b6360b4645600461794da4603d SHA256 c5492a5cb19ff0224b33a232ef450ae3241e453b7ed05bf15d9ebcf9ec3e7f36
+EBUILD pyfa-1.0.3.ebuild 1697 RMD160 fbf355d315c895e00111ec71ca7dd89a79150f60 SHA1 a62271228329f82d37ef721aaf2a0e796d095171 SHA256 7a43db42bebf277103faac2a197fe64a0aa4ae15354824dce2281592601d189f
+MISC ChangeLog 1424 RMD160 38381b9377eb96fd58906ccbac7e1406285f5697 SHA1 e24f6a3419a030a523daa8ff367cbecb7ba1d9f5 SHA256 96979fb09d569b62ae6f42c83930793a17914525716a12550a3898211933a36c
 MISC metadata.xml 582 RMD160 3f0d62cc7468e86f1f5d0ebc5476b43fc7ec5a36 SHA1 25396574747d7aff13fb415ba67753a50ef7e692 SHA256 f57c21ddd3e1d285ae34b20f4bc34cdd7e1b08f964b5a3b2151f5dfb564a750e
diff --git a/games-util/pyfa/files/pyfa-1.0.3-staticPath.patch b/games-util/pyfa/files/pyfa-1.0.3-staticPath.patch
new file mode 100644
index 000000000..4eff73006
--- /dev/null
+++ b/games-util/pyfa/files/pyfa-1.0.3-staticPath.patch
@@ -0,0 +1,15 @@
+Make staticPath settable from configforced
+
+--- a/config.py
++++ b/config.py
+@@ -30,7 +30,9 @@ if savePath is None:
+     savePath = unicode(os.path.expanduser(os.path.join("~", ".pyfa")), sys.getfilesystemencoding())
+ 
+ # Static EVE Data from the staticdata repository, should be in the staticdata directory in our pyfa directory
+-staticPath = os.path.join(pyfaPath, "staticdata")
++staticPath = getattr(configforced, "staticPath", None)
++if staticPath is None:
++    staticPath = os.path.join(pyfaPath, "staticdata")
+ 
+ # The database where we store all the fits etc
+ saveDB = os.path.join(savePath, "saveddata.db")
diff --git a/games-util/pyfa/pyfa-1.0_rc2.ebuild b/games-util/pyfa/pyfa-1.0.3.ebuild
index ef166b337..c0791ee10 100644
--- a/games-util/pyfa/pyfa-1.0_rc2.ebuild
+++ b/games-util/pyfa/pyfa-1.0.3.ebuild
@@ -4,16 +4,16 @@
 
 EAPI=3
 PYTHON_DEPEND="2:2.6"
-PYTHON_USE_WITH="sqlite"
+PYTHON_USE_WITH="sqlite threads"
 
 inherit eutils python
 
-FOLDER="stable"
 if [[ ${PV/_rc*/} == ${PV} ]] ; then
-	MY_PV=${PV}-stable-src
+	MY_PV=${PV}-incarna-src
+	FOLDER=stable/${PV}
 else
 	MY_PV=${PV/_rc/-stable-RC}-src
-	FOLDER+=/${PV/*_rc/RC}
+	FOLDER=stable/${PV/*_rc/RC}
 fi
 
 DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
@@ -33,6 +33,9 @@ DEPEND=${RDEPEND}
 S=${WORKDIR}/${PN}
 
 src_prepare() {
+	# make staticPath settable from configforced again
+	epatch "${FILESDIR}/${P}-staticPath.patch"
+
 	python_convert_shebangs -r -x 2 .
 	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" -e "s:%%EROOT%%:${EROOT}:" \
 		"${FILESDIR}/configforced.py" > configforced.py