diff options
| -rw-r--r-- | games-util/pyfa/ChangeLog | 11 | ||||
| -rw-r--r-- | games-util/pyfa/files/pyfa-1.1.20-staticPath.patch (renamed from games-util/pyfa/files/pyfa-1.1-staticPath.patch) | 16 | ||||
| -rw-r--r-- | games-util/pyfa/pyfa-1.1.20.ebuild (renamed from games-util/pyfa/pyfa-1.1.18.ebuild) | 8 | ||||
| -rw-r--r-- | games-util/pyfa/pyfa-9999.ebuild | 8 |
4 files changed, 25 insertions, 18 deletions
diff --git a/games-util/pyfa/ChangeLog b/games-util/pyfa/ChangeLog index f5e18bfacd36..bb8b41e6caf1 100644 --- a/games-util/pyfa/ChangeLog +++ b/games-util/pyfa/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for games-util/pyfa -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/ChangeLog,v 1.24 2013/12/02 02:09:29 tetromino Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/ChangeLog,v 1.25 2014/02/05 06:17:45 tetromino Exp $ + +*pyfa-1.1.20 (05 Feb 2014) + + 05 Feb 2014; Alexandre Rostovtsev <tetromino@gentoo.org> -pyfa-1.1.18.ebuild, + +pyfa-1.1.20.ebuild, pyfa-9999.ebuild, +files/pyfa-1.1.20-staticPath.patch, + -files/pyfa-1.1-staticPath.patch: + Version bump for Rubicon 1.1; remove obsolete version. *pyfa-9999 (02 Dec 2013) *pyfa-1.1.18 (02 Dec 2013) diff --git a/games-util/pyfa/files/pyfa-1.1-staticPath.patch b/games-util/pyfa/files/pyfa-1.1.20-staticPath.patch index d477f9c94d7f..cdcc9f90d3e5 100644 --- a/games-util/pyfa/files/pyfa-1.1-staticPath.patch +++ b/games-util/pyfa/files/pyfa-1.1.20-staticPath.patch @@ -1,20 +1,20 @@ -From 9a8411e9a6c58e5285ab3ae0a4feed05b6107acf Mon Sep 17 00:00:00 2001 +From 69660180a59d0d100097dedbc507d4af73267e8d Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev <tetromino@gentoo.org> Date: Wed, 30 Nov 2011 12:50:53 -0500 Subject: [PATCH] Make staticPath settable from configforced --- - config.py | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + config.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config.py b/config.py -index f2844b5..1f51700 100644 +index e39e0d3..e028c36 100644 --- a/config.py +++ b/config.py -@@ -48,7 +48,9 @@ def defPaths(): - savePath = unicode(os.path.expanduser(os.path.join("~", ".pyfa")), sys.getfilesystemencoding()) +@@ -66,7 +66,9 @@ def defPaths(): - # Static EVE Data from the staticdata repository, should be in the staticdata directory in our pyfa directory + # 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: @@ -23,5 +23,5 @@ index f2844b5..1f51700 100644 # The database where we store all the fits etc saveDB = os.path.join(savePath, "saveddata.db") -- -1.7.8.rc3 +1.8.5.3 diff --git a/games-util/pyfa/pyfa-1.1.18.ebuild b/games-util/pyfa/pyfa-1.1.20.ebuild index 06138bee1020..6c437e74de90 100644 --- a/games-util/pyfa/pyfa-1.1.18.ebuild +++ b/games-util/pyfa/pyfa-1.1.20.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.18.ebuild,v 1.1 2013/12/02 02:09:29 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.20.ebuild,v 1.1 2014/02/05 06:17:45 tetromino Exp $ EAPI="5" PYTHON_COMPAT=( python{2_6,2_7} ) @@ -18,7 +18,7 @@ if [[ ${PV} = 9999 ]]; then inherit git-2 KEYWORDS="" else - SRC_URI="https://github.com/DarkFenX/Pyfa/releases/download/v${PV}/${P}-rubicon-1.0-src.zip" + SRC_URI="https://github.com/DarkFenX/Pyfa/releases/download/v${PV}/${P}-rubicon-1.1-src.zip" KEYWORDS="~amd64 ~arm ~x86" fi IUSE="+graph" @@ -38,7 +38,7 @@ src_prepare() { edos2unix config.py pyfa.py service/settings.py # make staticPath settable from configforced again - epatch "${FILESDIR}/${PN}-1.1-staticPath.patch" + epatch "${FILESDIR}/${PN}-1.1.20-staticPath.patch" # do not try to save exported html to python sitedir epatch "${FILESDIR}/${PN}-1.1.8-html-export-path.patch" diff --git a/games-util/pyfa/pyfa-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild index a41a75142da0..721a6d28a6c1 100644 --- a/games-util/pyfa/pyfa-9999.ebuild +++ b/games-util/pyfa/pyfa-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-9999.ebuild,v 1.1 2013/12/02 02:09:29 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-9999.ebuild,v 1.2 2014/02/05 06:17:45 tetromino Exp $ EAPI="5" PYTHON_COMPAT=( python{2_6,2_7} ) @@ -18,7 +18,7 @@ if [[ ${PV} = 9999 ]]; then inherit git-2 KEYWORDS="" else - SRC_URI="https://github.com/DarkFenX/Pyfa/releases/download/v${PV}/${P}-rubicon-1.0-src.zip" + SRC_URI="https://github.com/DarkFenX/Pyfa/releases/download/v${PV}/${P}-rubicon-1.1-src.zip" KEYWORDS="~amd64 ~arm ~x86" fi IUSE="+graph" @@ -38,7 +38,7 @@ src_prepare() { edos2unix config.py pyfa.py service/settings.py # make staticPath settable from configforced again - epatch "${FILESDIR}/${PN}-1.1-staticPath.patch" + epatch "${FILESDIR}/${PN}-1.1.20-staticPath.patch" # do not try to save exported html to python sitedir epatch "${FILESDIR}/${PN}-1.1.8-html-export-path.patch" |