games-util/pyfa: Version bump. SRC_URI has changed. Adjusted minimum python and wxpython versions per upstream documentation. RC2 allows paths to be overridden using a site-specific configforced.py file, patch is no longer required. Convert shebangs using python_convert_shebangs.

svn path=/sunrise/; revision=11721

5 files changed, 31 insertions, 62 deletions

diff --git a/games-util/pyfa/ChangeLog b/games-util/pyfa/ChangeLog
index 1ab2353f0..a6f928fa5 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: $
 
+  23 Jan 2011; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
+  -pyfa-1.0_rc1.ebuild, +pyfa-1.0_rc2.ebuild,
+  -files/pyfa-1.0_rc1-paths.patch, +files/configforced.py:
+  Version bump. SRC_URI has changed. Adjusted minimum python and wxpython
+  versions per upstream documentation. RC2 allows paths to be overridden using
+  a site-specific configforced.py file, patch is no longer required. Convert
+  shebangs using python_convert_shebangs.
+
   21 Jan 2011; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
   +pyfa-1.0_rc1.ebuild, +files/pyfa-1.0_rc1-paths.patch,
   +files/pyfa.desktop, +metadata.xml:
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index 4baf204a3..d0bce8acd 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -1,6 +1,6 @@
-AUX pyfa-1.0_rc1-paths.patch 1900 RMD160 12510b06a7d258f8f50c2bb9467432613f8fbddf SHA1 1e3e63b9c10ab8ab06af9e7cc9ab9a4258aa9300 SHA256 5e50fc62faa8fbeea792d23f9bc644b2d1d67e26fc4bab9d7cda0b1a7df79323
+AUX configforced.py 141 RMD160 97aa3025140ad05588f294a723b5e0c53620aa0a SHA1 4b162c62ab09a1f7186cb71b416181ab7a545c73 SHA256 3a2b219182419888548bd0981ffa2bacb2a5f059ea00e3327b1bdd83ad1076bc
 AUX pyfa.desktop 155 RMD160 37f31fe5d62b2690b7761babb0dfeb8c0171ae80 SHA1 cb3a43b949524de9692f323cda9e7adad2efe218 SHA256 c395891d87eaaac64e3ba7954d623efaf161d906527099ed4b0c680c63a041eb
-DIST pyfa-1.0-stable-RC1-src.tar.bz2 5572232 RMD160 16c52ee488951e7fd3a0241bfd8770a28a8c334a SHA1 f6945d6aa7a0861f770bfa70415025ac74d730db SHA256 f54038db30dccdf5de7c6c5729d0e3c92ac95daa9370e6642cf64a413147781e
-EBUILD pyfa-1.0_rc1.ebuild 1264 RMD160 b309fd48709042de93417b11ebf194b5687847ed SHA1 580aaef22dc7a61e8330dd56b7d4064f7df8bb44 SHA256 d06418a0f59e5826fb3c59d89aa2381744469f1e89d89ab520d84dd2de0e3bcf
-MISC ChangeLog 311 RMD160 679ef05ed53a1a0e8f309a712cc1a58419e29837 SHA1 29f002b8e53c0c8c41dde35ab5f6131137db8eb8 SHA256 1e5bbdd97a2a9e43583d8fbaf1a5859436d31ac6a423143fc733ffd45e686be0
+DIST pyfa-1.0-stable-RC2-src.tar.bz2 5608540 RMD160 5bf466cfda3217928b75d45bd9a10b963a1bb64a SHA1 703c37b714121f73d56f3d9f4d53d3bbe493ce1c SHA256 48bea3935cb430b78450cbefb65b89e69e668f9effd4307c841282eafc3fdf83
+EBUILD pyfa-1.0_rc2.ebuild 1568 RMD160 a409a54019cd13fd46aac8c69b411f42b6b3f60d SHA1 11c299d651ec19d26184a0250ce324aa94af0420 SHA256 09b7fea0f33582e1b1c361f3331d2843687a1ea855c056bc8deae8353d3b1fc7
+MISC ChangeLog 759 RMD160 20ac99e9d545e1d8582df1d99ec9e8c68e755e89 SHA1 1773e90f36f2eed15deb189c47b919b3a5399938 SHA256 71f0edb2518771dca7b4a89aac053fa4666530f0d3f3782c445f5dcc24742f68
 MISC metadata.xml 582 RMD160 3f0d62cc7468e86f1f5d0ebc5476b43fc7ec5a36 SHA1 25396574747d7aff13fb415ba67753a50ef7e692 SHA256 f57c21ddd3e1d285ae34b20f4bc34cdd7e1b08f964b5a3b2151f5dfb564a750e
diff --git a/games-util/pyfa/files/configforced.py b/games-util/pyfa/files/configforced.py
new file mode 100644
index 000000000..16a74340a
--- /dev/null
+++ b/games-util/pyfa/files/configforced.py
@@ -0,0 +1,4 @@
+# Gentoo-specific settings
+pyfaPath = u'%%SITEDIR%%/pyfa'
+staticPath = u'%%EROOT%%usr/share/pyfa/staticdata'
+gameDB = staticPath + "/eve.db"
diff --git a/games-util/pyfa/files/pyfa-1.0_rc1-paths.patch b/games-util/pyfa/files/pyfa-1.0_rc1-paths.patch
deleted file mode 100644
index 124b3a655..000000000
--- a/games-util/pyfa/files/pyfa-1.0_rc1-paths.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ru pyfa-orig/config.py pyfa/config.py
---- pyfa-orig/config.py	2010-11-13 22:10:04.000000000 -0500
-+++ pyfa/config.py	2011-01-20 17:34:51.435713844 -0500
-@@ -1,5 +1,6 @@
- import os
- import sys
-+import sysconfig
- 
- # Turns on debug mode
- debug = False
-@@ -8,14 +9,16 @@
- 
- # The main pyfa directory which contains run.py 
- # python 2.X uses ansi by default, so we need to convert the character encoding :(
--pyfaPath = unicode(os.path.join(os.getcwd(), os.path.dirname(sys.modules['__main__'].__file__)),
--    sys.getfilesystemencoding())
-+# pyfaPath = os.path.join(os.getcwd(), os.path.dirname(sys.modules['__main__'].__file__)),
-+#    sys.getfilesystemencoding())
-+pyfaPath = os.path.join(sysconfig.get_path("purelib"), "pyfa")
- 
- # Where we store the saved fits etc, default is the current users home directory
- savePath = os.path.expanduser(os.path.join("~", ".pyfa"))
- 
- # Static EVE Data from the staticdata repository, should be in the staticdata directory in our pyfa directory
--staticPath = os.path.join(pyfaPath, "staticdata")
-+# staticPath = os.path.join(pyfaPath, "staticdata")
-+staticPath = os.path.join(sysconfig.get_path("data"), "share", "pyfa", "staticdata")
- 
- # The database where we store all the fits etc 
- saveDB = os.path.join(savePath, "saveddata.db")
-diff -ru pyfa-orig/run.py pyfa/run.py
---- pyfa-orig/run.py	2010-11-13 11:58:28.000000000 -0500
-+++ pyfa/run.py	2011-01-19 17:53:01.236136058 -0500
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- #===============================================================================
- # Copyright (C) 2010 Diego Duclos
- #
-@@ -18,6 +18,9 @@
- # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
- #===============================================================================
- 
-+import os, sys, sysconfig
-+sys.path.append(os.path.join(sysconfig.get_path("purelib"), "pyfa"))
-+
- import config
- 
- # try:
diff --git a/games-util/pyfa/pyfa-1.0_rc1.ebuild b/games-util/pyfa/pyfa-1.0_rc2.ebuild
index e08ed96d7..b41bf2368 100644
--- a/games-util/pyfa/pyfa-1.0_rc1.ebuild
+++ b/games-util/pyfa/pyfa-1.0_rc2.ebuild
@@ -3,20 +3,22 @@
 # $Header: $
 
 EAPI=3
-PYTHON_DEPEND="2"
+PYTHON_DEPEND="2:2.6"
 PYTHON_USE_WITH="sqlite"
 
 inherit eutils python
 
+FOLDER="stable"
 if [[ ${PV/_rc*/} == ${PV} ]] ; then
 	MY_PV=${PV}-stable-src
 else
 	MY_PV=${PV/_rc/-stable-RC}-src
+	FOLDER+=/${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/stable/${PN}-${MY_PV}.tar.bz2"
+SRC_URI="http://dl.evefit.org/${FOLDER}/${PN}-${MY_PV}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-2.1 CCPL-Attribution-2.5"
 SLOT="0"
@@ -24,24 +26,28 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+graph"
 
 RDEPEND="dev-python/sqlalchemy
-	dev-python/wxpython
+	>=dev-python/wxpython-2.8
 	graph? ( dev-python/matplotlib[wxwidgets] dev-python/numpy )"
 DEPEND=${RDEPEND}
 
 S=${WORKDIR}/${PN}
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-paths.patch"
+	python_convert_shebangs -r -x 2 .
+	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" -e "s:%%EROOT%%:${EROOT}:" \
+		"${FILESDIR}/configforced.py" > configforced.py
 }
 
 src_install() {
-	newbin run.py ${PN} || die "newbin failed"
-	rm run.py
-	insinto "$(python_get_sitedir)/${PN}"
-	doins -r eos gui icons service *.py *.txt || die "doins failed"
+	local packagedir=$(python_get_sitedir)/${PN}
+	insinto "${packagedir}"
+	doins -r eos gui icons service config*.py info.py gpl.txt || die "doins failed"
+	exeinto "${packagedir}"
+	doexe ${PN}.py || die "doexe failed"
+	dosym "${packagedir}/${PN}.py" /usr/bin/${PN} || die "dosym failed"
 	insinto /usr/share/${PN}
 	doins -r staticdata || die "doins failed"
-	dodoc README || die "dodoc failed"
+	dodoc readme.txt || die "dodoc failed"
 	doicon icons/${PN}.png || die "doicon failed"
 	domenu "${FILESDIR}/${PN}.desktop" || die "domenu failed"
 }