From bd4aeefe33e63f613512604e47bfca7b2187697d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Nov 2019 16:06:58 +0000 Subject: gentoo resync : 03.11.2019 --- games-util/Manifest.gz | Bin 7214 -> 7211 bytes games-util/joystick/Manifest | 5 +- .../joystick/files/joystick-1.4.8-udev.patch | 52 ----------- games-util/joystick/joystick-1.6.0.ebuild | 42 --------- games-util/joystick/joystick-1.7.0.ebuild | 41 +++++++++ games-util/pyfa/Manifest | 5 +- games-util/pyfa/files/pyfa-2.9.3-import-pyfa.patch | 28 ++++++ games-util/pyfa/pyfa-2.14.1.ebuild | 97 +++++++++++++++++++++ games-util/pyfa/pyfa-9999.ebuild | 76 ++++++++-------- 9 files changed, 210 insertions(+), 136 deletions(-) delete mode 100644 games-util/joystick/files/joystick-1.4.8-udev.patch delete mode 100644 games-util/joystick/joystick-1.6.0.ebuild create mode 100644 games-util/joystick/joystick-1.7.0.ebuild create mode 100644 games-util/pyfa/files/pyfa-2.9.3-import-pyfa.patch create mode 100644 games-util/pyfa/pyfa-2.14.1.ebuild (limited to 'games-util') diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz index 7b3e5098b344..3518c98f6db2 100644 Binary files a/games-util/Manifest.gz and b/games-util/Manifest.gz differ diff --git a/games-util/joystick/Manifest b/games-util/joystick/Manifest index 7824607915cd..d8e6fe806329 100644 --- a/games-util/joystick/Manifest +++ b/games-util/joystick/Manifest @@ -1,7 +1,6 @@ -AUX joystick-1.4.8-udev.patch 1724 BLAKE2B 63fd913ee85bbcdb00ccf8150dcccca4f2f6c36ef274b04dffd78aaaf9906048368495855edaa8809f371b7f63320ad89b3c40f94242b8d1f4316ab04a4eece6 SHA512 8a00825c9fb293e174eace79b1ce08af9eb2c6e18450daa62ae67b7c6a49ebe6b2490de4ccc7c1177edb300ed361a0920773b14d90c1aae4a34062ca16ad76de AUX joystick-1.6.0-build.patch 831 BLAKE2B 942038f6997caa84cdbc8c05a6353dd448c1b70f9229f38084e2b8c80df2f8d3df3eb8a0da754a7ba56863aaed58375eec22267f08d304bd550d2237054f6e16 SHA512 071b15e16a1688e2d743dbf0bc44c784184ee93698b660394c83bed719d579952c9d73680e3e24754a41d5de69a65559b61255b0366c3437a193fc526c3d6064 -DIST linuxconsoletools-1.6.0.tar.bz2 50563 BLAKE2B 26f68f4a9a4af5b875bc7efcc70edd80978a560f62c415b4957ee851260a2f6e6227c5a3001fb009777eac7e19d0449a8335486290ae0aaa9467ad8e1e9a89fb SHA512 35ca923cceca729bcbab95dff18682abd0d87a297e70aa8707fbabccde018fef0775a99195af4bf9111ba33210a14c10d1a766f83112cd535930a1ae430c7c75 DIST linuxconsoletools-1.6.1.tar.bz2 50854 BLAKE2B 0614e72226c575499ae5976011a0fca146a1981e2d355f7554f105b184bdd4f1090bf5374377e89f3881c5476e3c3a362b70f86cfd83440264066ea50a8c6a4b SHA512 b520c0a2d55986204619e3a5a00fb8b1e26453ac6df4f51c8c87495661a68bb6fe5a1947a3e079a53a537bf06d23c73c404a4d7e4d4dd18c0f7f69c1985a77be -EBUILD joystick-1.6.0.ebuild 887 BLAKE2B 4884fd349de63ed785b16f5f094463619560a4bfeb59ad5b9b9a4b24fd3d47eb00dd285ec2b4957e544828e846a953b5c5b77a8dad1a65564ad38a84a10e0982 SHA512 53c67ffa860135221e573741ca2352fefed4b8284022b906383bf63775ea62b751792218c3f9dd36448c20346683d6ee657d9a91dc7f748506c2827b2db0c3f5 +DIST linuxconsoletools-1.7.0.tar.bz2 52960 BLAKE2B 438e69e7aa220ea3fc92a9a72bda081c7877663c451f3101bc30e344a7a0f0f20b1c2f4ecd78c0db501b6442e2cd20e9f288c9c331118e8c666a61c3ac4b6851 SHA512 260667e167281dd6f4de0904c2852a5bf3d9d0fe9d603135d4849c5a6610997306c9b476f64e4015d17a4dc8e4a8d36e96e01b9b63664fc7b493201fe12b4f56 EBUILD joystick-1.6.1.ebuild 841 BLAKE2B 88add5fc4038140e9af4fcceeac0efd19119285d467bc335dc89ed24e35a57c0b87f1af14989a8dd297654971b639a0ca076096c32ba4d137b22a1b9504d577b SHA512 a0ac620ef668b62951e2c317c59c615f5234b727ecf3fbffa3c47c02055f6d185b37649bdd8a2c992cf8abfc8f5cea72194cf9ad2211b4f12586234283ddc627 +EBUILD joystick-1.7.0.ebuild 844 BLAKE2B 90f27f297b1ceebece8e845819988c7aff6c24d36d1d87c221844d4550c1caff777157514f02c40c82e89430fc067ca33b34faa5d6b3d25dc4f6ed558efb258b SHA512 43d97ac907c5a47c5c5b9b3731c53ca4935c26b08513056397f8338758172337bd55b8974c209762feb9949ed304bf162c2323d826fee508a6d6a6a5f4345591 MISC metadata.xml 335 BLAKE2B e83ffecd1afda0861555f62d9bad50f99c8e1bebb296f303bbdb8624ea283eb04d30d76a74d9970f519e303e851991ae33b232f74c9d2fdacce16b59fccdf9f5 SHA512 6440a6652a98c7439b22df51f22089ddd867be3e07e6c04001aa15b1fc01fd84dc8d3244f106abe4ae89caf7561aa45fe2526f2f9e8e8844a5e44f9f8a51df41 diff --git a/games-util/joystick/files/joystick-1.4.8-udev.patch b/games-util/joystick/files/joystick-1.4.8-udev.patch deleted file mode 100644 index c0032493ebf7..000000000000 --- a/games-util/joystick/files/joystick-1.4.8-udev.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -ru linuxconsoletools-1.4.8.orig/utils/jscal-restore.in linuxconsoletools-1.4.8/utils/jscal-restore.in ---- linuxconsoletools-1.4.8.orig/utils/jscal-restore.in 2011-12-15 10:49:01.000000000 -0500 -+++ linuxconsoletools-1.4.8/utils/jscal-restore.in 2015-05-16 01:54:00.799168225 -0400 -@@ -6,8 +6,13 @@ - exit 1 - fi - --if [ ! -x /sbin/udevadm ]; then -- echo Restoring joystick configuration requires udev! >&2 -+for f in /sbin/udevadm /bin/udevadm ; -+do -+ [ -x $f ] && UDEVADM=$f -+done -+ -+if [ -z "$UDEVADM" ] ; then -+ echo Storing joystick configuration requires udev! >&2 - exit 1 - fi - -@@ -30,7 +35,7 @@ - # in the NAME value - IFS=$'\x0A' - --for ATTRIBUTE in $( /sbin/udevadm info -a -n $1 | @@PREFIX@@/share/joystick/ident ); do -+for ATTRIBUTE in $( ${UDEVADM} info -a -n $1 | @@PREFIX@@/share/joystick/ident ); do - ID=$( echo "$ATTRIBUTE" | cut -f 1 -d = ) - VALUE=$( echo "$ATTRIBUTE" | cut -f 2 -d \" ) - case $ID in -diff -ru linuxconsoletools-1.4.8.orig/utils/jscal-store.in linuxconsoletools-1.4.8/utils/jscal-store.in ---- linuxconsoletools-1.4.8.orig/utils/jscal-store.in 2011-12-15 10:49:01.000000000 -0500 -+++ linuxconsoletools-1.4.8/utils/jscal-store.in 2015-05-16 01:53:18.725607838 -0400 -@@ -11,14 +11,18 @@ - echo "Stores the device's calibration for future use." - exit 1 - fi -+for f in /sbin/udevadm /bin/udevadm ; -+do -+ [ -x $f ] && UDEVADM=$f -+done - --if [ ! -x /sbin/udevadm ]; then -+if [ -z "$UDEVADM" ] ; then - echo Storing joystick configuration requires udev! >&2 - exit 1 - fi - - ident=$(mktemp) --/sbin/udevadm info -a -n $1 | @@PREFIX@@/share/joystick/ident > $ident -+${UDEVADM} info -a -n $1 | @@PREFIX@@/share/joystick/ident > $ident - . $ident - rm $ident - diff --git a/games-util/joystick/joystick-1.6.0.ebuild b/games-util/joystick/joystick-1.6.0.ebuild deleted file mode 100644 index ce8acc0a4ad6..000000000000 --- a/games-util/joystick/joystick-1.6.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils toolchain-funcs - -MY_P="linuxconsoletools-${PV}" -DESCRIPTION="joystick testing utilities" -HOMEPAGE="https://sourceforge.net/projects/linuxconsole/ http://atrey.karlin.mff.cuni.cz/~vojtech/input/" -SRC_URI="mirror://sourceforge/linuxconsole/files/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="sdl udev" - -DEPEND="sdl? ( media-libs/libsdl:0[video] ) - ! +Date: Mon, 30 Oct 2017 09:52:32 +0100 +Subject: [PATCH] import pyfa + +Append $(python_get_sitedir)/pyfa to import path + +Ensures that pyfa's import statements continue to work for systemwide +installation. +--- + pyfa.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/pyfa.py b/pyfa.py +index d73ef097..dbf73db2 100755 +--- a/pyfa.py ++++ b/pyfa.py +@@ -22,6 +22,7 @@ + import datetime + import os + import sys ++sys.path.append(os.path.join("%%SITEDIR%%", "pyfa")) + from optparse import AmbiguousOptionError, BadOptionError, OptionParser + + import config +-- +2.21.0 + diff --git a/games-util/pyfa/pyfa-2.14.1.ebuild b/games-util/pyfa/pyfa-2.14.1.ebuild new file mode 100644 index 000000000000..2f7b3917e18b --- /dev/null +++ b/games-util/pyfa/pyfa-2.14.1.ebuild @@ -0,0 +1,97 @@ +# 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" + +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 +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="+graph" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +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}]" +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_DEPS}" +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 32200ccbee19..2f7b3917e18b 100644 --- a/games-util/pyfa/pyfa-9999.ebuild +++ b/games-util/pyfa/pyfa-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" -PYTHON_COMPAT=( python2_7 ) +EAPI="7" +PYTHON_COMPAT=( python3_6 ) PYTHON_REQ_USE="sqlite,threads" -inherit desktop eutils gnome2-utils python-r1 +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" @@ -16,64 +16,64 @@ 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" + S=${WORKDIR}/Pyfa-${PV} fi IUSE="+graph" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND=" +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}]" +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[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.0.5[${PYTHON_USEDEP}] - dev-python/wxpython:3.0[${PYTHON_USEDEP}] + >=dev-python/requests-2.0.0[${PYTHON_USEDEP}] + >=dev-python/roman-2.0.0[${PYTHON_USEDEP}] graph? ( - dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}] + >=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] ) ${PYTHON_DEPS}" -DEPEND="app-arch/zip" +BDEPEND="app-arch/zip" -[[ ${PV} = 9999 ]] || S=${WORKDIR}/Pyfa-${PV} +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/bitmapLoader.py service/settings.py - - # load gameDB and images from separate staticdata directory - eapply "${FILESDIR}/${PN}-1.33.1-staticdata.patch" + edos2unix config.py pyfa.py gui/bitmap_loader.py service/settings.py - # fix import path in the main script for systemwide installation - eapply "${FILESDIR}/${PN}-1.33.1-import-pyfa.patch" - - eapply_user + default # 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 + 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() { - 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 + 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 ..." @@ -89,9 +89,9 @@ src_install() { } pkg_postinst() { - gnome2_icon_cache_update + xdg_icon_cache_update } pkg_postrm() { - gnome2_icon_cache_update + xdg_icon_cache_update } -- cgit v1.2.3