From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 430C2138331 for ; Wed, 30 May 2018 13:50:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1DB59E0824; Wed, 30 May 2018 13:50:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E1D56E0824 for ; Wed, 30 May 2018 13:50:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4E18D335C57 for ; Wed, 30 May 2018 13:50:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F3AD62AF for ; Wed, 30 May 2018 13:50:19 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1527687337.7ad57335d01b572de6c6b180f1b5e8d8f86203b3.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-util/pyfa/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-util/pyfa/pyfa-9999.ebuild X-VCS-Directories: games-util/pyfa/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 7ad57335d01b572de6c6b180f1b5e8d8f86203b3 X-VCS-Branch: master Date: Wed, 30 May 2018 13:50:19 +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: f986bfcf-87a4-42e0-8fef-66f0c44d3aa7 X-Archives-Hash: e8623e728aca0b035b6bb5b98df30484 commit: 7ad57335d01b572de6c6b180f1b5e8d8f86203b3 Author: Andreas Zuber gmx ch> AuthorDate: Wed May 30 12:29:30 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed May 30 13:35:37 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ad57335 games-util/pyfa: update live ebuild Closes: https://github.com/gentoo/gentoo/pull/7367 Package-Manager: Portage-2.3.24, Repoman-2.3.6 games-util/pyfa/pyfa-9999.ebuild | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/games-util/pyfa/pyfa-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild index dbd5180ef37..32200ccbee1 100644 --- a/games-util/pyfa/pyfa-9999.ebuild +++ b/games-util/pyfa/pyfa-9999.ebuild @@ -1,33 +1,35 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="sqlite,threads" -inherit eutils gnome2-utils python-r1 +inherit desktop 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" +RESTRICT="mirror bindist" +LICENSE="GPL-3+ all-rights-reserved" 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" + SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi IUSE="+graph" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.0.5[${PYTHON_USEDEP}] - dev-python/wxpython:3.0[${PYTHON_USEDEP}] +RDEPEND=" >=dev-python/logbook-1.0.0[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] + >=dev-python/sqlalchemy-1.0.5[${PYTHON_USEDEP}] + dev-python/wxpython:3.0[${PYTHON_USEDEP}] graph? ( dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] ) @@ -48,28 +50,26 @@ src_prepare() { eapply_user - touch __init__.py + # make python recognize pyfa as a package + touch __init__.py || die 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" + "${FILESDIR}/configforced-1.15.1.py" > "${BUILD_DIR}/configforced.py" || die sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ - pyfa.py > "${BUILD_DIR}/pyfa" + pyfa.py > "${BUILD_DIR}/pyfa" || die } 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_moduleinto ${PN} + python_domodule eos gui service utils config*.py __init__.py + python_domodule "${BUILD_DIR}/configforced.py" python_doscript "${BUILD_DIR}/pyfa" - python_optimize } python_foreach_impl pyfa_py_install @@ -88,10 +88,6 @@ src_install() { domenu "${FILESDIR}/${PN}.desktop" } -pkg_preinst() { - gnome2_icon_savelist -} - pkg_postinst() { gnome2_icon_cache_update }