From 27afc3d0c9914c9999f8d57f4760b0c4627c5ce0 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Sun, 5 Jun 2016 18:06:24 -0400 Subject: games-util/pyfa: belated bump to 1.21.3 Package-Manager: portage-2.3.0_rc1 --- games-util/pyfa/Manifest | 2 +- .../pyfa/files/pyfa-1.1.8-html-export-path.patch | 33 ------- games-util/pyfa/pyfa-1.20.1.ebuild | 104 --------------------- games-util/pyfa/pyfa-1.21.3.ebuild | 104 +++++++++++++++++++++ 4 files changed, 105 insertions(+), 138 deletions(-) delete mode 100644 games-util/pyfa/files/pyfa-1.1.8-html-export-path.patch delete mode 100644 games-util/pyfa/pyfa-1.20.1.ebuild create mode 100644 games-util/pyfa/pyfa-1.21.3.ebuild (limited to 'games-util/pyfa') diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest index 984bd836e45b..f5da0868fe70 100644 --- a/games-util/pyfa/Manifest +++ b/games-util/pyfa/Manifest @@ -1 +1 @@ -DIST pyfa-1.20.1.tar.gz 7415996 SHA256 13e5f04590a8b9c15f72d6cde4a11af2465670c5ea78322fcfb14d3d7b00ed15 SHA512 11a1e9619e604dc0c28463efa2d106b677dc3b9177ef6a442a5a26e24055776a1b26e330fc7b6e2589a60213d989e8539eab653792f5804cc76c584fadeee07c WHIRLPOOL a087143205417787d549a044ec4fd80890bb8223b626638bc4f9407cc5e712023163d4891518ee8d8f54a459f45eb0752eaa494c8740a33d751298371829ea9a +DIST pyfa-1.21.3.tar.gz 7793523 SHA256 4ac79598f2e605ba7d5cd29cfef7a94f426d4cd9e934d13cbb2071afd566de3c SHA512 b5a691873421ef2d3b01d8bfd7121c63f07b96c75837fd3b93a5b77b8163943336dcd5bb85f8dcc056ce61b5103d5331afd5a81c09eb06a7050112b5d1a26681 WHIRLPOOL 65d6c9a52f4076d9be620aa3ac2ec5da23aaff32c547925b34480f7fc82ef9334fa737374419f0bf1bd827b3c6e0f34306c0d5de1dc6d441e88e096fd8aadc13 diff --git a/games-util/pyfa/files/pyfa-1.1.8-html-export-path.patch b/games-util/pyfa/files/pyfa-1.1.8-html-export-path.patch deleted file mode 100644 index e7614d21aa4d..000000000000 --- a/games-util/pyfa/files/pyfa-1.1.8-html-export-path.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 017938391c5b67327c489a5c3a6fc720d4204609 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Mon, 16 Jul 2012 05:43:38 -0400 -Subject: [PATCH] Export fits to home directory, not python sitedir - ---- - service/settings.py | 3 ++- - 1 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/service/settings.py b/service/settings.py -index 8f6e3a8..5ac386d 100644 ---- a/service/settings.py -+++ b/service/settings.py -@@ -21,6 +21,7 @@ import cPickle - import os.path - import config - import urllib2 -+import sys - - class SettingsProvider(): - BASE_PATH = os.path.join(config.savePath, "settings") -@@ -199,7 +200,7 @@ class HTMLExportSettings(): - return cls._instance - - def __init__(self): -- serviceHTMLExportDefaultSettings = {"enabled": False, "path": config.pyfaPath + os.sep + 'pyfaFits.html' } -+ serviceHTMLExportDefaultSettings = {"enabled": False, "path": unicode(os.path.expanduser(os.path.join('~', 'pyfaFits.html')), sys.getfilesystemencoding()) } - self.serviceHTMLExportSettings = SettingsProvider.getInstance().getSettings("pyfaServiceHTMLExportSettings", serviceHTMLExportDefaultSettings) - - def getEnabled(self): --- -1.7.8.6 - diff --git a/games-util/pyfa/pyfa-1.20.1.ebuild b/games-util/pyfa/pyfa-1.20.1.ebuild deleted file mode 100644 index 0d2065a0b205..000000000000 --- a/games-util/pyfa/pyfa-1.20.1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="6" -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite,threads" - -inherit eutils gnome2-utils python-r1 - -DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online" -HOMEPAGE="https://github.com/pyfa-org/Pyfa" - -LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm" -SLOT="0" -if [[ ${PV} = 9999 ]]; then - EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> pyfa-${PV}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" -fi -IUSE="+graph" - -RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/sqlalchemy[${PYTHON_USEDEP}] - dev-python/wxpython:3.0[${PYTHON_USEDEP}] - graph? ( - dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] ) - ${PYTHON_DEPS}" -DEPEND="app-arch/zip" - -[[ ${PV} = 9999 ]] || S=${WORKDIR}/Pyfa-${PV} - -src_prepare() { - # get rid of CRLF line endings introduced in 1.1.10 so patches work - edos2unix config.py pyfa.py service/settings.py - - # load gameDB and images from separate staticdata directory - eapply "${FILESDIR}/${PN}-1.15.1-staticdata.patch" - - # do not try to save exported html to python sitedir - eapply "${FILESDIR}/${PN}-1.1.8-html-export-path.patch" - - # fix import path in the main script for systemwide installation - eapply "${FILESDIR}/${PN}-1.15.1-import-pyfa.patch" - - eapply_user - - touch __init__.py - - pyfa_make_configforced() { - mkdir -p "${BUILD_DIR}" || die - sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ - -e "s:%%EPREFIX%%:${EPREFIX}:" \ - "${FILESDIR}/configforced-1.15.1.py" > "${BUILD_DIR}/configforced.py" - sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ - pyfa.py > "${BUILD_DIR}/pyfa" - } - python_foreach_impl pyfa_make_configforced -} - -src_install() { - pyfa_py_install() { - local packagedir=$(python_get_sitedir)/${PN} - insinto "${packagedir}" - doins -r eos gui service utils config*.py __init__.py - [[ -e info.py ]] && doins info.py # only in zip releases - doins "${BUILD_DIR}/configforced.py" - python_doscript "${BUILD_DIR}/pyfa" - python_optimize - } - python_foreach_impl pyfa_py_install - - insinto /usr/share/${PN} - doins eve.db - - einfo "Compressing images ..." - pushd imgs > /dev/null || die - zip -r imgs.zip * || die "zip failed" - doins imgs.zip - popd > /dev/null || die - - dodoc README.md - insinto /usr/share/icons/hicolor/32x32/apps - doins imgs/gui/pyfa.png - insinto /usr/share/icons/hicolor/64x64/apps - newins imgs/gui/pyfa64.png pyfa.png - domenu "${FILESDIR}/${PN}.desktop" -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-util/pyfa/pyfa-1.21.3.ebuild b/games-util/pyfa/pyfa-1.21.3.ebuild new file mode 100644 index 000000000000..6f524e585066 --- /dev/null +++ b/games-util/pyfa/pyfa-1.21.3.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite,threads" + +inherit eutils gnome2-utils python-r1 + +DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online" +HOMEPAGE="https://github.com/pyfa-org/Pyfa" + +LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm" +SLOT="0" +if [[ ${PV} = 9999 ]]; then + EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git" + inherit git-r3 + KEYWORDS="" +else + SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> pyfa-${PV}.tar.gz" + KEYWORDS="~amd64 ~arm ~x86" +fi +IUSE="+graph" + +RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/sqlalchemy[${PYTHON_USEDEP}] + dev-python/wxpython:3.0[${PYTHON_USEDEP}] + graph? ( + dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] ) + ${PYTHON_DEPS}" +DEPEND="app-arch/zip" + +[[ ${PV} = 9999 ]] || S=${WORKDIR}/Pyfa-${PV} + +src_prepare() { + # get rid of CRLF line endings introduced in 1.1.10 so patches work + edos2unix config.py pyfa.py service/settings.py + + # load gameDB and images from separate staticdata directory + eapply "${FILESDIR}/${PN}-1.15.1-staticdata.patch" + + # do not try to save exported html to python sitedir + eapply "${FILESDIR}/${PN}-1.20.2-html-export-path.patch" + + # fix import path in the main script for systemwide installation + eapply "${FILESDIR}/${PN}-1.15.1-import-pyfa.patch" + + eapply_user + + touch __init__.py + + pyfa_make_configforced() { + mkdir -p "${BUILD_DIR}" || die + sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ + -e "s:%%EPREFIX%%:${EPREFIX}:" \ + "${FILESDIR}/configforced-1.15.1.py" > "${BUILD_DIR}/configforced.py" + sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ + pyfa.py > "${BUILD_DIR}/pyfa" + } + python_foreach_impl pyfa_make_configforced +} + +src_install() { + pyfa_py_install() { + local packagedir=$(python_get_sitedir)/${PN} + insinto "${packagedir}" + doins -r eos gui service utils config*.py __init__.py + [[ -e info.py ]] && doins info.py # only in zip releases + doins "${BUILD_DIR}/configforced.py" + python_doscript "${BUILD_DIR}/pyfa" + python_optimize + } + python_foreach_impl pyfa_py_install + + insinto /usr/share/${PN} + doins eve.db + + einfo "Compressing images ..." + pushd imgs > /dev/null || die + zip -r imgs.zip * || die "zip failed" + doins imgs.zip + popd > /dev/null || die + + dodoc README.md + insinto /usr/share/icons/hicolor/32x32/apps + doins imgs/gui/pyfa.png + insinto /usr/share/icons/hicolor/64x64/apps + newins imgs/gui/pyfa64.png pyfa.png + domenu "${FILESDIR}/${PN}.desktop" +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} -- cgit v1.2.3-65-gdbad