From 05565df1c7db9a8fe2fa9a7110ff4d70cf56ab63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 7 Feb 2020 15:14:08 +0100 Subject: games-util/pyfa: Switch to PYTHON_MULTI_USEDEP API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- games-util/pyfa/pyfa-2.14.1.ebuild | 34 +++++++----- games-util/pyfa/pyfa-2.15.1-r1.ebuild | 100 ++++++++++++++++++++++++++++++++++ games-util/pyfa/pyfa-2.15.1.ebuild | 96 -------------------------------- games-util/pyfa/pyfa-9999.ebuild | 32 ++++++----- 4 files changed, 137 insertions(+), 125 deletions(-) create mode 100644 games-util/pyfa/pyfa-2.15.1-r1.ebuild delete mode 100644 games-util/pyfa/pyfa-2.15.1.ebuild (limited to 'games-util') diff --git a/games-util/pyfa/pyfa-2.14.1.ebuild b/games-util/pyfa/pyfa-2.14.1.ebuild index e3c4bc18650..51e160ed66c 100644 --- a/games-util/pyfa/pyfa-2.14.1.ebuild +++ b/games-util/pyfa/pyfa-2.14.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -25,21 +25,25 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="mirror bindist" DEPEND=" - >=dev-python/cryptography-2.3[${PYTHON_USEDEP}] - >=dev-python/logbook-1.0.0[${PYTHON_USEDEP}] - >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}] - >=dev-python/wxpython-4.0.4[webkit,${PYTHON_USEDEP}]" + $(python_gen_cond_dep ' + >=dev-python/cryptography-2.3[${PYTHON_MULTI_USEDEP}] + >=dev-python/logbook-1.0.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/pyyaml-5.1[${PYTHON_MULTI_USEDEP}] + >=dev-python/sqlalchemy-1.3.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/wxpython-4.0.4[webkit,${PYTHON_MULTI_USEDEP}] + ')" RDEPEND="${DEPEND} - >=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}] - >=dev-python/markdown2-2.3.0[${PYTHON_USEDEP}] - >=dev-python/packaging-16.8[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - >=dev-python/requests-2.0.0[${PYTHON_USEDEP}] - >=dev-python/roman-2.0.0[${PYTHON_USEDEP}] - graph? ( - >=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] ) + $(python_gen_cond_dep ' + >=dev-python/beautifulsoup-4.6.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/markdown2-2.3.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/packaging-16.8[${PYTHON_MULTI_USEDEP}] + dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] + >=dev-python/requests-2.0.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/roman-2.0.0[${PYTHON_MULTI_USEDEP}] + graph? ( + >=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] ) + ') ${PYTHON_DEPS}" BDEPEND="app-arch/zip" diff --git a/games-util/pyfa/pyfa-2.15.1-r1.ebuild b/games-util/pyfa/pyfa-2.15.1-r1.ebuild new file mode 100644 index 00000000000..5c6b262d499 --- /dev/null +++ b/games-util/pyfa/pyfa-2.15.1-r1.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +PYTHON_COMPAT=( python3_6 ) +PYTHON_REQ_USE="sqlite,threads" + +inherit desktop eutils python-single-r1 xdg-utils + +DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online" +HOMEPAGE="https://github.com/pyfa-org/Pyfa" + +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 +else + SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" + S=${WORKDIR}/Pyfa-${PV} +fi +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="mirror bindist" + +DEPEND=" + $(python_gen_cond_dep ' + >=dev-python/cryptography-2.3[${PYTHON_MULTI_USEDEP}] + >=dev-python/logbook-1.0.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/pyyaml-5.1[${PYTHON_MULTI_USEDEP}] + >=dev-python/sqlalchemy-1.3.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/wxpython-4.0.4[webkit,${PYTHON_MULTI_USEDEP}] + ') + ${PYTHON_DEPS}" +RDEPEND="${DEPEND} + $(python_gen_cond_dep ' + >=dev-python/beautifulsoup-4.6.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/markdown2-2.3.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/packaging-16.8[${PYTHON_MULTI_USEDEP}] + dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] + >=dev-python/requests-2.0.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/roman-2.0.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + ')" +BDEPEND="app-arch/zip" + +PATCHES=( + # fix import path in the main script for systemwide installation + "${FILESDIR}/${PN}-2.9.3-import-pyfa.patch" + ) + +src_prepare() { + # get rid of CRLF line endings introduced in 1.1.10 so patches work + edos2unix config.py pyfa.py gui/bitmap_loader.py service/settings.py + + default + + # make python recognize pyfa as a package + touch __init__.py || die + + sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ + -e "s:%%EPREFIX%%:${EPREFIX}:" \ + "${FILESDIR}/configforced-1.15.1.py" > configforced.py || die + sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ + pyfa.py > pyfa || die +} + +src_install() { + python_moduleinto ${PN} + python_domodule eos gui service utils graphs + python_domodule config*.py __init__.py version.yml configforced.py db_update.py + python_doscript pyfa + + insinto /usr/share/${PN} + + einfo "Creating database ..." + python ./db_update.py || die + 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 + doicon -s 32 imgs/gui/pyfa.png + newicon -s 64 imgs/gui/pyfa64.png pyfa.png + domenu "${FILESDIR}/${PN}.desktop" +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/games-util/pyfa/pyfa-2.15.1.ebuild b/games-util/pyfa/pyfa-2.15.1.ebuild deleted file mode 100644 index 68be8d9f02c..00000000000 --- a/games-util/pyfa/pyfa-2.15.1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=( python3_6 ) -PYTHON_REQ_USE="sqlite,threads" - -inherit desktop eutils python-single-r1 xdg-utils - -DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online" -HOMEPAGE="https://github.com/pyfa-org/Pyfa" - -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 -else - SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" - S=${WORKDIR}/Pyfa-${PV} -fi -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="mirror bindist" - -DEPEND=" - >=dev-python/cryptography-2.3[${PYTHON_USEDEP}] - >=dev-python/logbook-1.0.0[${PYTHON_USEDEP}] - >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}] - >=dev-python/wxpython-4.0.4[webkit,${PYTHON_USEDEP}] - ${PYTHON_DEPS}" -RDEPEND="${DEPEND} - >=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}] - >=dev-python/markdown2-2.3.0[${PYTHON_USEDEP}] - >=dev-python/packaging-16.8[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - >=dev-python/requests-2.0.0[${PYTHON_USEDEP}] - >=dev-python/roman-2.0.0[${PYTHON_USEDEP}] - >=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}]" -BDEPEND="app-arch/zip" - -PATCHES=( - # fix import path in the main script for systemwide installation - "${FILESDIR}/${PN}-2.9.3-import-pyfa.patch" - ) - -src_prepare() { - # get rid of CRLF line endings introduced in 1.1.10 so patches work - edos2unix config.py pyfa.py gui/bitmap_loader.py service/settings.py - - default - - # make python recognize pyfa as a package - touch __init__.py || die - - sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ - -e "s:%%EPREFIX%%:${EPREFIX}:" \ - "${FILESDIR}/configforced-1.15.1.py" > configforced.py || die - sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ - pyfa.py > pyfa || die -} - -src_install() { - python_moduleinto ${PN} - python_domodule eos gui service utils graphs - python_domodule config*.py __init__.py version.yml configforced.py db_update.py - python_doscript pyfa - - insinto /usr/share/${PN} - - einfo "Creating database ..." - python ./db_update.py || die - 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 - doicon -s 32 imgs/gui/pyfa.png - newicon -s 64 imgs/gui/pyfa64.png pyfa.png - domenu "${FILESDIR}/${PN}.desktop" -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/games-util/pyfa/pyfa-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild index 68be8d9f02c..5c6b262d499 100644 --- a/games-util/pyfa/pyfa-9999.ebuild +++ b/games-util/pyfa/pyfa-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -25,21 +25,25 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="mirror bindist" DEPEND=" - >=dev-python/cryptography-2.3[${PYTHON_USEDEP}] - >=dev-python/logbook-1.0.0[${PYTHON_USEDEP}] - >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}] - >=dev-python/wxpython-4.0.4[webkit,${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/cryptography-2.3[${PYTHON_MULTI_USEDEP}] + >=dev-python/logbook-1.0.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/pyyaml-5.1[${PYTHON_MULTI_USEDEP}] + >=dev-python/sqlalchemy-1.3.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/wxpython-4.0.4[webkit,${PYTHON_MULTI_USEDEP}] + ') ${PYTHON_DEPS}" RDEPEND="${DEPEND} - >=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}] - >=dev-python/markdown2-2.3.0[${PYTHON_USEDEP}] - >=dev-python/packaging-16.8[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - >=dev-python/requests-2.0.0[${PYTHON_USEDEP}] - >=dev-python/roman-2.0.0[${PYTHON_USEDEP}] - >=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}]" + $(python_gen_cond_dep ' + >=dev-python/beautifulsoup-4.6.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/markdown2-2.3.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/packaging-16.8[${PYTHON_MULTI_USEDEP}] + dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] + >=dev-python/requests-2.0.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/roman-2.0.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + ')" BDEPEND="app-arch/zip" PATCHES=( -- cgit v1.2.3