From bd4aeefe33e63f613512604e47bfca7b2187697d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
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] )
- !<x11-libs/tslib-1.0-r2"
-RDEPEND="${DEPEND}
- udev? ( virtual/udev )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.6.0-build.patch
- "${FILESDIR}"/${PN}-1.4.8-udev.patch
-)
-
-src_prepare() {
- default
-
- export PREFIX=/usr
- tc-export CC PKG_CONFIG
- export USE_SDL=$(usex sdl)
-}
-
-src_install() {
- default
- if use !udev ; then
- rm "${D}"/usr/bin/jscal-{re,}store || die
- fi
-}
diff --git a/games-util/joystick/joystick-1.7.0.ebuild b/games-util/joystick/joystick-1.7.0.ebuild
new file mode 100644
index 000000000000..a4389f20bcfb
--- /dev/null
+++ b/games-util/joystick/joystick-1.7.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit 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/libsdl2:0[video] )
+ !<x11-libs/tslib-1.0-r2"
+RDEPEND="${DEPEND}
+ udev? ( virtual/udev )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.0-build.patch
+)
+
+src_prepare() {
+ default
+
+ export PREFIX=/usr
+ tc-export CC PKG_CONFIG
+ export USE_SDL=$(usex sdl)
+}
+
+src_install() {
+ default
+ if ! use udev ; then
+ rm "${ED}"/usr/bin/jscal-{re,}store || die
+ fi
+}
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index ec7bc4df56c3..47b08aa14c65 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -1,14 +1,17 @@
AUX configforced-1.15.1.py 153 BLAKE2B 135edf54e69c985693bcdde747eba5e46f7ed1390a77e1a1d40c0a624f3605c3ec8dad2f3526cbd8f406ed39fc67d3b027b7e7e462bbfa48c5649c71f0692da6 SHA512 632576b9fbff3e93c26b6c2d4be74298aa8657affe82d2c5d571a645d733a7b96d5db6b89b819d3aec9ca68e4bef11e368f7c1cbac416e9bfed88a1025a46bfe
AUX pyfa-1.33.1-import-pyfa.patch 685 BLAKE2B a3d45d5438203233993ca3d8edd5061ccced36e550ef47ca8c9dfae9343c2cb7c4c952a961d5f7847c21bda27aefe30d6fd38b0875c3ccc1bda8313e519c471d SHA512 a7a6d18183c3494aa4e0436c7f527312be36a298f8fc31cfac7df3d60157c1ef501f725c0c79f1ade9b053d711e14ede9a2892b824530e1cf431590c6b56395e
AUX pyfa-1.33.1-staticdata.patch 1571 BLAKE2B ffa07ba329d3cbb5f198755fe814f431144fb30667fcfbc1102a0456c49601af37bc9ce141d80db8b961b018726acb78f38339793dee4ed654b70fd411a66bd8 SHA512 cd2c56f3805af70cc3fe294c21af5b32eea614292b8eeb856d2f36f2d7e46ce7a2f33f24115ac8af1cc2d77d39b2f7f397b495734f0ace954c61efb63b609128
+AUX pyfa-2.9.3-import-pyfa.patch 666 BLAKE2B 13b67511a64be93335453b617e1fad56768c9c582da4ebbef36b4848aca225220e2057c0fab088a060cc2149aed961f2063a1a34326b71f0cf3bb411105a77a7 SHA512 a0174726777d82229dcd167b005e176012a9c4398f066f183bf0b8d59bd1854411e74bca1c3848396a8c50be327c8ec4e21dde6d56d045b2af4cd13a68e0cc99
AUX pyfa.desktop 155 BLAKE2B bccfc81c4bc7dd9099ac4bd11fdb0d5f8d72b53b5dc8a700147e7e5996b14aac9e4b46e2884a473ecc8d8b1f49305e66c46cbc7e6c5e43e93e5a3fa71c5efa08 SHA512 d62a44e4e724057581a360cc1eb10aa4c7a0c50cb1d95137e58ba14db17644c852da2582be8d508c50b7359e7f99dc893d78d15cb11c46967a9b7896ff667781
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
+DIST pyfa-2.14.1.tar.gz 14452477 BLAKE2B e4c688cff14eecaa71f86fb9e22f6a585a3136a4bd7df65c8dd65ed82c2aa9e530210134daaba25251df92dc55a7e538474b39c1d54e4bcb1817eac17791d517 SHA512 d3d3219fa37f44c81d85165c7e780261e149b47db147417ea26edaff448484ce565607aded714a4f44ca23b8c1586c8597ace856020c4c319cea6d39f353b140
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-2.14.1.ebuild 2657 BLAKE2B 72bbd27ce0a677bbe5abbdf3cd619e0b8708c09d11c8dc9403c189469fa4937d9c32930f2df1bf34f81494026dc0e6ce90ea7e2711af7bdb21137241082dc3e4 SHA512 d4c66cc65585b6868a82f9dccdc09ea9de1986f299a994c814e1957fad587faebc13a94c49b2f26eaa52344325dffbe1acf5e150a54de4e732a9884e31cac1bc
+EBUILD pyfa-9999.ebuild 2657 BLAKE2B 72bbd27ce0a677bbe5abbdf3cd619e0b8708c09d11c8dc9403c189469fa4937d9c32930f2df1bf34f81494026dc0e6ce90ea7e2711af7bdb21137241082dc3e4 SHA512 d4c66cc65585b6868a82f9dccdc09ea9de1986f299a994c814e1957fad587faebc13a94c49b2f26eaa52344325dffbe1acf5e150a54de4e732a9884e31cac1bc
MISC metadata.xml 817 BLAKE2B 3756e4c4cd95064bfdfb74ffccbc1162b457e620cd4b99f1c4c04943443a83cec1a5642056f219dfc090c37a230dfadc07dacd0e6f2d7a9380804e951c1d8c86 SHA512 3323fe99b3a0768fddc07ae1ca23e099e8097717c382ec9a9cd2f63b293f6caf8d9164140548f2a4b2754e925d1e1302ba1a56c0320eb343f5a7ff0206d88811
diff --git a/games-util/pyfa/files/pyfa-2.9.3-import-pyfa.patch b/games-util/pyfa/files/pyfa-2.9.3-import-pyfa.patch
new file mode 100644
index 000000000000..fc691d48bb4c
--- /dev/null
+++ b/games-util/pyfa/files/pyfa-2.9.3-import-pyfa.patch
@@ -0,0 +1,28 @@
+From c12e4c1358025940aa1fbdf0e17f85e3821e7230 Mon Sep 17 00:00:00 2001
+From: Andreas Zuber <zuber@puzzle.ch>
+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