From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D8A8F1388C1 for ; Mon, 29 Feb 2016 04:20:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B3345E07F0; Mon, 29 Feb 2016 04:20:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 39C5BE07F0 for ; Mon, 29 Feb 2016 04:20:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E5E81340B6A for ; Mon, 29 Feb 2016 04:20:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C9F791BA1 for ; Mon, 29 Feb 2016 04:20:32 +0000 (UTC) From: "Alexandre Rostovtsev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Rostovtsev" Message-ID: <1456719579.e7b90b7077529185a753f81d0441a0043d085d22.tetromino@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-util/pyfa/files/, games-util/pyfa/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-util/pyfa/Manifest games-util/pyfa/files/configforced.py games-util/pyfa/files/pyfa-1.1.11-import-pyfa.patch games-util/pyfa/files/pyfa-1.1.20-staticPath.patch games-util/pyfa/pyfa-1.15.0.ebuild games-util/pyfa/pyfa-1.19.1.ebuild X-VCS-Directories: games-util/pyfa/ games-util/pyfa/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Rostovtsev X-VCS-Revision: e7b90b7077529185a753f81d0441a0043d085d22 X-VCS-Branch: master Date: Mon, 29 Feb 2016 04:20:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5cd92f81-1e34-493f-a885-1ae7319904a1 X-Archives-Hash: 15da4546f25fa8bf3d9884af8a063380 commit: e7b90b7077529185a753f81d0441a0043d085d22 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Mon Feb 29 04:08:30 2016 +0000 Commit: Alexandre Rostovtsev gentoo org> CommitDate: Mon Feb 29 04:19:39 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7b90b70 games-util/pyfa: bump to 1.19.1 for bug #569944 Thanks to Stefan Reimer & Captain Crutches in bug #569944 Package-Manager: portage-2.2.27 games-util/pyfa/Manifest | 2 +- games-util/pyfa/files/configforced.py | 4 --- .../pyfa/files/pyfa-1.1.11-import-pyfa.patch | 28 --------------------- games-util/pyfa/files/pyfa-1.1.20-staticPath.patch | 27 -------------------- .../{pyfa-1.15.0.ebuild => pyfa-1.19.1.ebuild} | 29 ++++++++++++++-------- 5 files changed, 19 insertions(+), 71 deletions(-) diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest index 5d7d734..5ddc1dd 100644 --- a/games-util/pyfa/Manifest +++ b/games-util/pyfa/Manifest @@ -1 +1 @@ -DIST pyfa-1.15.0.tar.gz 6243527 SHA256 27ec6748b5f1083050d47a364a8699e521a614c5c643a639441c82168017123c SHA512 c966e3fd7627ef575247b00eacee7392f7f2d32b14485c2a7e5aa0c6f3fe6ad99c1a536bfcbfcc6de29fa4bdc177b6a12e0a571926c1b7b755ef9fc6f76f3bad WHIRLPOOL f6ba22d7f3899c4a3fd702a5d0145b39e06e70793da2682c6bb0df0b3772c02f250b59d05a4fee23f72d87010f02d916a944c0499852dc0be845e1ae56b61904 +DIST pyfa-1.19.1.tar.gz 6688136 SHA256 f597019117b335971287fd47c1faa5be049f8a6879d4144b6c8a0039f35cea98 SHA512 b5f09ca0dde528636c5e6bc0b6987b6203dfc70ad9aa0c9238150e83de76ac138e302b5db7f40d885d6702c4c1eabae184d49af0a84e6bf3402036df24d296f6 WHIRLPOOL 8f5e42065d9945c96c7cca13301ab6ed0a286db7dc3041926af920dddf5605910ea9c259d00db1e937f2329f6156d0b4ed36330ea6d89f14bd0db9abccfca0ff diff --git a/games-util/pyfa/files/configforced.py b/games-util/pyfa/files/configforced.py deleted file mode 100644 index a8008c2..0000000 --- a/games-util/pyfa/files/configforced.py +++ /dev/null @@ -1,4 +0,0 @@ -# Gentoo-specific settings -pyfaPath = u'%%SITEDIR%%/pyfa' -staticPath = u'%%EPREFIX%%/usr/share/pyfa/staticdata' -gameDB = staticPath + "/eve.db" diff --git a/games-util/pyfa/files/pyfa-1.1.11-import-pyfa.patch b/games-util/pyfa/files/pyfa-1.1.11-import-pyfa.patch deleted file mode 100644 index 8269080..0000000 --- a/games-util/pyfa/files/pyfa-1.1.11-import-pyfa.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f301dcd0df741514e889fc234811cd4770dca6c7 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Wed, 5 Dec 2012 00:48:12 -0500 -Subject: [PATCH] Append $(python_get_sitedir)/pyfa to import path - -Ensures that pyfa's import statements continue to work for systemwide -installation. ---- - pyfa.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/pyfa.py b/pyfa.py -index 6992aaf..d66cb70 100755 ---- a/pyfa.py -+++ b/pyfa.py -@@ -63,6 +63,9 @@ if __name__ == "__main__": - parser.add_option("-r", "--root", action="store_true", dest="rootsavedata", help="if you want pyfa to store its data in root folder, use this option", default=False) - (options, args) = parser.parse_args() - -+ import os -+ sys.path.append(os.path.join("%%SITEDIR%%", "pyfa")) -+ - import config - # Configure paths - if options.rootsavedata is True: --- -1.8.0 - diff --git a/games-util/pyfa/files/pyfa-1.1.20-staticPath.patch b/games-util/pyfa/files/pyfa-1.1.20-staticPath.patch deleted file mode 100644 index cdcc9f9..0000000 --- a/games-util/pyfa/files/pyfa-1.1.20-staticPath.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 69660180a59d0d100097dedbc507d4af73267e8d Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Wed, 30 Nov 2011 12:50:53 -0500 -Subject: [PATCH] Make staticPath settable from configforced - ---- - config.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/config.py b/config.py -index e39e0d3..e028c36 100644 ---- a/config.py -+++ b/config.py -@@ -66,7 +66,9 @@ def defPaths(): - - # 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") --- -1.8.5.3 - diff --git a/games-util/pyfa/pyfa-1.15.0.ebuild b/games-util/pyfa/pyfa-1.19.1.ebuild similarity index 76% rename from games-util/pyfa/pyfa-1.15.0.ebuild rename to games-util/pyfa/pyfa-1.19.1.ebuild index 3ba98b7..bf7db2e 100644 --- a/games-util/pyfa/pyfa-1.15.0.ebuild +++ b/games-util/pyfa/pyfa-1.19.1.ebuild @@ -25,34 +25,34 @@ IUSE="+graph" RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}] dev-python/sqlalchemy[${PYTHON_USEDEP}] - dev-python/wxpython:2.8[${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/unzip" +DEPEND="app-arch/zip" -S=${WORKDIR}/Pyfa-${PV} +[[ ${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 - # make staticPath settable from configforced again - epatch "${FILESDIR}/${PN}-1.1.20-staticPath.patch" + # load gameDB and images from separate staticdata directory + epatch "${FILESDIR}/${PN}-1.15.1-staticdata.patch" # do not try to save exported html to python sitedir epatch "${FILESDIR}/${PN}-1.1.8-html-export-path.patch" # fix import path in the main script for systemwide installation - epatch "${FILESDIR}/${PN}-1.1.11-import-pyfa.patch" + epatch "${FILESDIR}/${PN}-1.15.1-import-pyfa.patch" touch __init__.py pyfa_make_configforced() { mkdir -p "${BUILD_DIR}" || die sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ -e "s:%%EPREFIX%%:${EPREFIX}:" \ - "${FILESDIR}/configforced.py" > "${BUILD_DIR}/configforced.py" + "${FILESDIR}/configforced-1.15.1.py" > "${BUILD_DIR}/configforced.py" sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ pyfa.py > "${BUILD_DIR}/pyfa" } @@ -63,7 +63,7 @@ src_install() { pyfa_py_install() { local packagedir=$(python_get_sitedir)/${PN} insinto "${packagedir}" - doins -r eos gui icons service utils config*.py __init__.py gpl.txt + 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" @@ -72,12 +72,19 @@ src_install() { python_foreach_impl pyfa_py_install insinto /usr/share/${PN} - doins -r staticdata + 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 icons/pyfa.png + doins imgs/gui/pyfa.png insinto /usr/share/icons/hicolor/64x64/apps - newins icons/pyfa64.png pyfa.png + newins imgs/gui/pyfa64.png pyfa.png domenu "${FILESDIR}/${PN}.desktop" }