Version bump with various updates and UI fixes. Update homepage and source URI. Drop old.

(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

3 files changed, 18 insertions, 29 deletions

diff --git a/games-util/pyfa/ChangeLog b/games-util/pyfa/ChangeLog
index cd2700c0f262..0a8e6cd2c1a8 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.20 2013/06/06 03:47:23 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/ChangeLog,v 1.21 2013/07/20 03:09:03 tetromino Exp $
+
+*pyfa-1.1.15 (20 Jul 2013)
+
+  20 Jul 2013; Alexandre Rostovtsev <tetromino@gentoo.org> -pyfa-1.1.13.ebuild,
+  pyfa-1.1.14.ebuild, +pyfa-1.1.15.ebuild:
+  Version bump with various updates and UI fixes. Update homepage and source
+  URI. Drop old.
 
 *pyfa-1.1.14 (06 Jun 2013)
 
diff --git a/games-util/pyfa/pyfa-1.1.14.ebuild b/games-util/pyfa/pyfa-1.1.14.ebuild
index 83fdad157523..6a9070db1a0f 100644
--- a/games-util/pyfa/pyfa-1.1.14.ebuild
+++ b/games-util/pyfa/pyfa-1.1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.14.ebuild,v 1.1 2013/06/06 03:47:23 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.14.ebuild,v 1.2 2013/07/20 03:09:03 tetromino Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -8,17 +8,9 @@ PYTHON_REQ_USE="sqlite,threads"
 
 inherit eutils gnome2-utils python-r1
 
-if [[ ${PV/_rc*/} == ${PV} ]] ; then
-	MY_PV=${PV}-odyssey-1.0-src
-	FOLDER=pyfa/stable/${PV}
-else
-	MY_PV=${PV/_rc/-stable-RC}-src
-	FOLDER=pyfa/stable/${PV/*_rc/RC}
-fi
-
 DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="http://www.evefit.org/static/pyfa"
-SRC_URI="http://dl.evefit.org/${FOLDER}/${PN}-${MY_PV}.tar.bz2"
+HOMEPAGE="https://github.com/DarkFenX/Pyfa"
+SRC_URI="http://go-dl.eve-files.com/media/corp/Kadesh/${P}-odyssey-1.0-src.zip"
 
 LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm"
 SLOT="0"
@@ -31,14 +23,13 @@ RDEPEND="dev-python/sqlalchemy[${PYTHON_USEDEP}]
 		dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}] )
 	${PYTHON_DEPS}"
-DEPEND="app-text/dos2unix
-	${PYTHON_DEPS}"
+DEPEND="app-arch/unzip"
 
 S=${WORKDIR}/${PN}
 
 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
+	edos2unix config.py pyfa.py service/settings.py
 
 	# make staticPath settable from configforced again
 	epatch "${FILESDIR}/${PN}-1.1-staticPath.patch"
diff --git a/games-util/pyfa/pyfa-1.1.13.ebuild b/games-util/pyfa/pyfa-1.1.15.ebuild
index de67a9fc0164..106c5e1e9457 100644
--- a/games-util/pyfa/pyfa-1.1.13.ebuild
+++ b/games-util/pyfa/pyfa-1.1.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.13.ebuild,v 1.1 2013/03/31 17:55:31 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.15.ebuild,v 1.1 2013/07/20 03:09:03 tetromino Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -8,17 +8,9 @@ PYTHON_REQ_USE="sqlite,threads"
 
 inherit eutils gnome2-utils python-r1
 
-if [[ ${PV/_rc*/} == ${PV} ]] ; then
-	MY_PV=${PV}-retribution-1.1.6-src
-	FOLDER=pyfa/stable/${PV}
-else
-	MY_PV=${PV/_rc/-stable-RC}-src
-	FOLDER=pyfa/stable/${PV/*_rc/RC}
-fi
-
 DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="http://www.evefit.org/static/pyfa"
-SRC_URI="http://dl.evefit.org/${FOLDER}/${PN}-${MY_PV}.tar.bz2"
+HOMEPAGE="https://github.com/DarkFenX/Pyfa"
+SRC_URI="http://go-dl.eve-files.com/media/corp/Kadesh/${P}-odyssey-1.0-src.zip"
 
 LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm"
 SLOT="0"
@@ -31,14 +23,13 @@ RDEPEND="dev-python/sqlalchemy[${PYTHON_USEDEP}]
 		dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}] )
 	${PYTHON_DEPS}"
-DEPEND="app-text/dos2unix
-	${PYTHON_DEPS}"
+DEPEND="app-arch/unzip"
 
 S=${WORKDIR}/${PN}
 
 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
+	edos2unix config.py pyfa.py service/settings.py
 
 	# make staticPath settable from configforced again
 	epatch "${FILESDIR}/${PN}-1.1-staticPath.patch"