From 0bff53119f08d677db6c1a991bd30741682a8a08 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 2 Jun 2018 17:13:10 +0100 Subject: Revert "gentoo resync : 02.06.2018" This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec. --- games-util/pyfa/Manifest | 4 +- games-util/pyfa/pyfa-1.37.0.ebuild | 97 -------------------------------------- games-util/pyfa/pyfa-9999.ebuild | 36 +++++++------- 3 files changed, 21 insertions(+), 116 deletions(-) delete mode 100644 games-util/pyfa/pyfa-1.37.0.ebuild (limited to 'games-util/pyfa') diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest index ec7bc4df56c3..3f9ffc31ff7a 100644 --- a/games-util/pyfa/Manifest +++ b/games-util/pyfa/Manifest @@ -5,10 +5,8 @@ AUX pyfa.desktop 155 BLAKE2B bccfc81c4bc7dd9099ac4bd11fdb0d5f8d72b53b5dc8a700147 DIST pyfa-1.34.0.tar.gz 8629709 BLAKE2B 5b16296b675383a446bb21133c9e83726a92beb221babbf8fbe4b19f0f7e95bb19fd6050a5c2e3d5e602df4bbb83debfeefd6ec7efdbff35a47934ef9b29979f SHA512 4642efd4de5be4add3c3f994d7be9dbeeb231fe86229f7944d52f265527c7a79698d3da5ccac3018e02c6000b0da888ad0e64382e12f74b7dd7b3398e7bb2d48 DIST pyfa-1.35.0.tar.gz 8743938 BLAKE2B 623a70ea8d28c41f94b5c54c3b8b57ddc6b6604f0eccaa1d9716f8b47295bfca12e2db068d3283448b2a6719a3ef73c74d42a98550a1b062e93e6d1091a45797 SHA512 28b3294e8c1d611402d4123d184d6ddf57886a51264fc25529ca3e0cd8af6d41dbe28b15c4714e591f940427651249761db8d2353006b169d358974bc691f121 DIST pyfa-1.35.1.tar.gz 8746324 BLAKE2B f224f78c97f15d37e2276512541985bfd2ae80c031233261837cd142eddc16a853688a4f1f1f8684736f757d60fd57c41fb14987f336274b2284bd1de26239b3 SHA512 6da5e2d3351157f35c32c7b210d8bfb86a9dc2ea3a3df02449950c498ffabecff3a48fe38086dce75ec5a2cc2549dd28b474015edc0ea01c56a2ff58d1ba3f69 -DIST pyfa-1.37.0.tar.gz 8795428 BLAKE2B 33aa0159b41fe2f228be13788f4e91933205a1883af229ffa97af0816dbce307fa8ce9ebc53b335a99decb84f9a28e83b977daf3c600df1cdd0336ba2c413ba3 SHA512 21094a1c374a60447e38261762ee13cd212f6af5f8d757c8b626774fb5a10d10e99267da1311d3164664b62169edd2772519a7b4ebd7414db2493f5121df5c8c EBUILD pyfa-1.34.0.ebuild 2697 BLAKE2B 71befdff7b877943da1c58af9905f9318539956c703f0d6fccf195138842b9e4fc7a57f04dd3de1d6be01d2bd2efc28cfb659612b723a3bf422ca72e51224358 SHA512 5184f4207c8c0d02c52b5265fff0f393f6f871c2b8b1ba0d29835a252d57305bdcf5957053e705b49b2e2a6ec5db8c7f953f3b884ff848ef5a7643d10c3ddb28 EBUILD pyfa-1.35.0.ebuild 2693 BLAKE2B cfad57e838b2f6fb1f5071a750bba9a6eca9da1d7c8a5306017d1f9486c14948ba6a84cc2be706d360e134da7ac81b51f914d4342769043d884dce4c5b091985 SHA512 46d5c45fc04385cca35eea00c12d6ac0356ebf2e4bb721334b89c21a556f9d45c37fa29d61546062055beca041a6af63431fbee3fa701a18d722d50a5db2bce6 EBUILD pyfa-1.35.1.ebuild 2693 BLAKE2B cfad57e838b2f6fb1f5071a750bba9a6eca9da1d7c8a5306017d1f9486c14948ba6a84cc2be706d360e134da7ac81b51f914d4342769043d884dce4c5b091985 SHA512 46d5c45fc04385cca35eea00c12d6ac0356ebf2e4bb721334b89c21a556f9d45c37fa29d61546062055beca041a6af63431fbee3fa701a18d722d50a5db2bce6 -EBUILD pyfa-1.37.0.ebuild 2623 BLAKE2B dfdab3bb7422a9006d515d9896ab5820c91a398a6e6c18734acdbbe4771ed796f4c961fa4e20d40df8b97153ed3c6749e225521f9a733999e07fe28368fdbf04 SHA512 bbf89fb71da7084075a26f058d82bacb5216c3f42f23645ce6dbd56edbf676ee3194034216bdf0baf862ec822d49911c4c53d4eacfcdc35cf29610e21911b7cc -EBUILD pyfa-9999.ebuild 2623 BLAKE2B dfdab3bb7422a9006d515d9896ab5820c91a398a6e6c18734acdbbe4771ed796f4c961fa4e20d40df8b97153ed3c6749e225521f9a733999e07fe28368fdbf04 SHA512 bbf89fb71da7084075a26f058d82bacb5216c3f42f23645ce6dbd56edbf676ee3194034216bdf0baf862ec822d49911c4c53d4eacfcdc35cf29610e21911b7cc +EBUILD pyfa-9999.ebuild 2690 BLAKE2B 75617e4742feba8338064811a6ce993df0e1fdf1f1dde52777c7417ec9b7f349af8c6f70223522a285737a06e869aa241bae43781f34339ddaa8013b9f592f29 SHA512 5e9ca6acc8a7b53f327c7190ef98473a377f030dc33497117479a93cda83b2ea9e6bf3ff5bed3cf1e2ca7097059365b91a868aaf72dcd1835884575cdef9bde3 MISC metadata.xml 817 BLAKE2B 3756e4c4cd95064bfdfb74ffccbc1162b457e620cd4b99f1c4c04943443a83cec1a5642056f219dfc090c37a230dfadc07dacd0e6f2d7a9380804e951c1d8c86 SHA512 3323fe99b3a0768fddc07ae1ca23e099e8097717c382ec9a9cd2f63b293f6caf8d9164140548f2a4b2754e925d1e1302ba1a56c0320eb343f5a7ff0206d88811 diff --git a/games-util/pyfa/pyfa-1.37.0.ebuild b/games-util/pyfa/pyfa-1.37.0.ebuild deleted file mode 100644 index 32200ccbee19..000000000000 --- a/games-util/pyfa/pyfa-1.37.0.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# 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 desktop eutils gnome2-utils python-r1 - -DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online" -HOMEPAGE="https://github.com/pyfa-org/Pyfa" - -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 -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi -IUSE="+graph" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -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}] ) - ${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 gui/bitmapLoader.py service/settings.py - - # load gameDB and images from separate staticdata directory - eapply "${FILESDIR}/${PN}-1.33.1-staticdata.patch" - - # fix import path in the main script for systemwide installation - eapply "${FILESDIR}/${PN}-1.33.1-import-pyfa.patch" - - eapply_user - - # 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" || die - sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ - pyfa.py > "${BUILD_DIR}/pyfa" || die - } - python_foreach_impl pyfa_make_configforced -} - -src_install() { - pyfa_py_install() { - 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_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 - doicon -s 32 imgs/gui/pyfa.png - newicon -s 64 imgs/gui/pyfa64.png pyfa.png - domenu "${FILESDIR}/${PN}.desktop" -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-util/pyfa/pyfa-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild index 32200ccbee19..dbd5180ef370 100644 --- a/games-util/pyfa/pyfa-9999.ebuild +++ b/games-util/pyfa/pyfa-9999.ebuild @@ -1,35 +1,33 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2017 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 desktop eutils gnome2-utils python-r1 +inherit eutils gnome2-utils python-r1 DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online" HOMEPAGE="https://github.com/pyfa-org/Pyfa" -RESTRICT="mirror bindist" -LICENSE="GPL-3+ all-rights-reserved" +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 -> ${P}.tar.gz" + SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> pyfa-${PV}.tar.gz" KEYWORDS="~amd64 ~x86" fi IUSE="+graph" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND=" - >=dev-python/logbook-1.0.0[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] +RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}] >=dev-python/sqlalchemy-1.0.5[${PYTHON_USEDEP}] dev-python/wxpython:3.0[${PYTHON_USEDEP}] + >=dev-python/logbook-1.0.0[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] graph? ( dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] ) @@ -50,26 +48,28 @@ src_prepare() { eapply_user - # make python recognize pyfa as a package - touch __init__.py || die + 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" || die + "${FILESDIR}/configforced-1.15.1.py" > "${BUILD_DIR}/configforced.py" sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ - pyfa.py > "${BUILD_DIR}/pyfa" || die + pyfa.py > "${BUILD_DIR}/pyfa" } python_foreach_impl pyfa_make_configforced } src_install() { pyfa_py_install() { - python_moduleinto ${PN} - python_domodule eos gui service utils config*.py __init__.py - python_domodule "${BUILD_DIR}/configforced.py" + 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 @@ -88,6 +88,10 @@ src_install() { domenu "${FILESDIR}/${PN}.desktop" } +pkg_preinst() { + gnome2_icon_savelist +} + pkg_postinst() { gnome2_icon_cache_update } -- cgit v1.2.3