gentoo resync : 17.02.2020

9 files changed, 110 insertions, 8 deletions

diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index f8e3adb9da25..82bb65448519 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/lgogdownloader/Manifest b/games-util/lgogdownloader/Manifest
index ca2986fe94d1..e7364562cc3e 100644
--- a/games-util/lgogdownloader/Manifest
+++ b/games-util/lgogdownloader/Manifest
@@ -1,5 +1,5 @@
 AUX jsoncpp.patch 775 BLAKE2B 42f6bc206487f272c20b1a665e58121a17e2b2047709b9e153d9c70375e02b71994ff0dbb6400b332a74d343c987dfbd08d0ab3b13903295c580903d6cc81083 SHA512 84ff324ad9e2eeb885f9523cf395cadcbe510d93d70b36609a27b5ea4e180b83dd4dda83f547f948e507594746a42ac43bdcfc0dc05c6b0cd9c92c9aeb205acb
 DIST lgogdownloader-3.5.tar.gz 87061 BLAKE2B bde2a8f2c229c9bf62fe83650e81c950806a6c6b9e4f591f08931082f59a961f39c16b5c18c8787edd46555e257354e71e0f1d009de1881f4d25257b28725996 SHA512 e3ce9d4932f9cda362b1472bd5eb605b01d1e9214b79e2d88fa4c2f02b0d54082df68b2f197d714e71a72d57be746dbf0afed68b3316888fdfa6e02c31611ee0
-EBUILD lgogdownloader-3.5.ebuild 882 BLAKE2B 8cbe251718753177375795a11e3c3d994760ce00ad0d0c96872bef6ac07fa929aef9ade64e264770615969fb725183554a39e7395619f9b4205853e7690b1355 SHA512 8b0f14e2dffef24fc54fe5a23c6bb6d4883e880d8c030beaf5eb71498be525eee04f5bfd36f1921319f4b695ecdcb06700a26f0301cb8d5774e395cc4f95c9b5
-EBUILD lgogdownloader-9999.ebuild 818 BLAKE2B cc39a95b73ad4dda466781e0b4fccd6eaa995d027e12d8da36015b39ca7a0070993f807aac4443c7d2e319b531aac177a0e77dfe8d8b7f8d3aaeccb7f73dadfc SHA512 2ab6bb8d2bc11117ea2d16fb87cbf30f8741ad2ee6f5ff038367a699c966ce43cefe287033c4dab34d600cd6cf5202489d88a260ab9ed01f73872d77b9cc0481
+EBUILD lgogdownloader-3.5.ebuild 882 BLAKE2B 67ce600dc8174980d0de73287819f5d14723a82fdd249b5c4d68ee65f65aec127e314eecb68ccc4bf26ac1faeb1e7d0e18b880174cd2f1cc0fbc61110d8a48e1 SHA512 3e8611b040693e44fded38bd196fdaf8c646da9413a64692c90dbd24bbfc4aeda5f37f33a121394f4cecc6b8de47c41770b89a880745099df2897fc8cb63993a
+EBUILD lgogdownloader-9999.ebuild 818 BLAKE2B 7878d55d83a8551012c5470114b32db492a6c689f8d9706b8f64fab786875fba9123abc1235b11fefe5925ad4ff5bd4aef15fd28fcf1ad18914cae2457b8491a SHA512 4fdf98eb21701cc70c8ad82694609db0f7ce0456085b751d47d990ddb577b2588b35f6ed266945bb298167a530215ba7244bced52a9fdef20edcf125276b662b
 MISC metadata.xml 1097 BLAKE2B 029a2a56a669431f4128f2e3c375f66a03c91e101b4d18555cbff0d7e0840025b5cace7c7eae5a98f5c2a79d2ace2c0caf8824b6d29ccccd67de98fee188e924 SHA512 2dbc9390d544b0c5c215dcf6788ced1bcbf0de677dafbafa500725d4968b0ab733df82c4799c62cbe30fb058ffdc7332cb7bd1459f872093e777ce9e108ce720
diff --git a/games-util/lgogdownloader/lgogdownloader-3.5.ebuild b/games-util/lgogdownloader/lgogdownloader-3.5.ebuild
index bd02b105269b..a9948879d367 100644
--- a/games-util/lgogdownloader/lgogdownloader-3.5.ebuild
+++ b/games-util/lgogdownloader/lgogdownloader-3.5.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
diff --git a/games-util/lgogdownloader/lgogdownloader-9999.ebuild b/games-util/lgogdownloader/lgogdownloader-9999.ebuild
index 37dfd7c2f858..45cbec465be6 100644
--- a/games-util/lgogdownloader/lgogdownloader-9999.ebuild
+++ b/games-util/lgogdownloader/lgogdownloader-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
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index 987881ff309e..d7d9d8ab1a4d 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -3,7 +3,9 @@ AUX pyfa-2.9.3-import-pyfa.patch 666 BLAKE2B 13b67511a64be93335453b617e1fad56768
 AUX pyfa.desktop 155 BLAKE2B bccfc81c4bc7dd9099ac4bd11fdb0d5f8d72b53b5dc8a700147e7e5996b14aac9e4b46e2884a473ecc8d8b1f49305e66c46cbc7e6c5e43e93e5a3fa71c5efa08 SHA512 d62a44e4e724057581a360cc1eb10aa4c7a0c50cb1d95137e58ba14db17644c852da2582be8d508c50b7359e7f99dc893d78d15cb11c46967a9b7896ff667781
 DIST pyfa-2.14.1.tar.gz 14452477 BLAKE2B e4c688cff14eecaa71f86fb9e22f6a585a3136a4bd7df65c8dd65ed82c2aa9e530210134daaba25251df92dc55a7e538474b39c1d54e4bcb1817eac17791d517 SHA512 d3d3219fa37f44c81d85165c7e780261e149b47db147417ea26edaff448484ce565607aded714a4f44ca23b8c1586c8597ace856020c4c319cea6d39f353b140
 DIST pyfa-2.15.1.tar.gz 14516568 BLAKE2B ba3b1170f35681ab33bece447b4bdf563c8f964037dc6b35cbd23360f7e36c61dd9074e34b5648c7a04b59ad192f5babd75ce2a935940a52e62de8cc174f7e5b SHA512 2d8fcb8608e31c135b8dac7239afe0a5acb0d32fba1291ce6ebafe093ef232c08f0aa42d172ebac5beefb7dba47aad9eb3833c679e3d02edc9cc056739c7538b
+DIST pyfa-2.17.0.tar.gz 12348275 BLAKE2B fd670a6d34760285561ed07e82c3c54eb9a74cad732b24b89fab103fe8013608c18f27461bfac28a854df3ce7273fac1011752a8da2447b69432ad36709c08dd SHA512 d4af2c6a30deb8b205e5db55c25e1fa48dc74b964c9d85da69acca9bbd19764b77abc96ff42a2e99733d132253081a3e2c3de6ef787c162e392a9627ab62c529
 EBUILD pyfa-2.14.1.ebuild 2807 BLAKE2B 0ac7d54fa394babc6ce843b428786c76952f2ede30e38f691d33a6b60aeb2a20f1e1ef79b8de5e299db5f8761b6b8628044ab71cbbc330feb2a78e4b2d95305d SHA512 5fe53304f63f11edaab725003a8cf61e1143b7a15894f438b27ee129e5fae553a39c797d38ecde201143fb774aff5fb8ea40d0791fb293f4a6a6d8c1b720be63
 EBUILD pyfa-2.15.1-r1.ebuild 2786 BLAKE2B f581cab4f597f217540ece2b71c59bb0c29e90cdb10d451ff30d5d50bfdd59ada3b5cc808f41c3359ca600d6b20476ca91c74ccbec85716a581a6a9582639857 SHA512 3d12fcecbd06b437ddbab27a6610bf40e4d7058c14c58ef6d74103b8f54fd189866dd466bfe72c448f7d8e86490d33e1804b5bd30848105781fc88da6eafb3f4
-EBUILD pyfa-9999.ebuild 2786 BLAKE2B f581cab4f597f217540ece2b71c59bb0c29e90cdb10d451ff30d5d50bfdd59ada3b5cc808f41c3359ca600d6b20476ca91c74ccbec85716a581a6a9582639857 SHA512 3d12fcecbd06b437ddbab27a6610bf40e4d7058c14c58ef6d74103b8f54fd189866dd466bfe72c448f7d8e86490d33e1804b5bd30848105781fc88da6eafb3f4
+EBUILD pyfa-2.17.0.ebuild 2786 BLAKE2B 2504240e044dac7512c17b6f776a0f3aaf96c662e5a5927f12193e62ee6db614e66f8e7fcd592f1b91429ec77684f3c1770b825fe9c5e0121e33dc94e73bdff2 SHA512 25067ab2c303fc14640291184735387509f65f16a55f819d7f0270ad8ff039ab50d45044235330ee7c0652ec9154fadf19e9f7cd426c821987ceb49e38d3bda9
+EBUILD pyfa-9999.ebuild 2786 BLAKE2B 2504240e044dac7512c17b6f776a0f3aaf96c662e5a5927f12193e62ee6db614e66f8e7fcd592f1b91429ec77684f3c1770b825fe9c5e0121e33dc94e73bdff2 SHA512 25067ab2c303fc14640291184735387509f65f16a55f819d7f0270ad8ff039ab50d45044235330ee7c0652ec9154fadf19e9f7cd426c821987ceb49e38d3bda9
 MISC metadata.xml 817 BLAKE2B 3756e4c4cd95064bfdfb74ffccbc1162b457e620cd4b99f1c4c04943443a83cec1a5642056f219dfc090c37a230dfadc07dacd0e6f2d7a9380804e951c1d8c86 SHA512 3323fe99b3a0768fddc07ae1ca23e099e8097717c382ec9a9cd2f63b293f6caf8d9164140548f2a4b2754e925d1e1302ba1a56c0320eb343f5a7ff0206d88811
diff --git a/games-util/pyfa/pyfa-2.17.0.ebuild b/games-util/pyfa/pyfa-2.17.0.ebuild
new file mode 100644
index 000000000000..145ca005c0d1
--- /dev/null
+++ b/games-util/pyfa/pyfa-2.17.0.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-3.1.2[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-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild
index 5c6b262d499b..145ca005c0d1 100644
--- a/games-util/pyfa/pyfa-9999.ebuild
+++ b/games-util/pyfa/pyfa-9999.ebuild
@@ -41,7 +41,7 @@ RDEPEND="${DEPEND}
 		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/matplotlib-3.1.2[wxwidgets,${PYTHON_MULTI_USEDEP}]
 		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
 	')"
 BDEPEND="app-arch/zip"
diff --git a/games-util/qjoypad/Manifest b/games-util/qjoypad/Manifest
index 533c38980edd..6a12d2ddd7e5 100644
--- a/games-util/qjoypad/Manifest
+++ b/games-util/qjoypad/Manifest
@@ -1,4 +1,4 @@
 AUX qjoypad-4.3.0-cmake.patch 487 BLAKE2B 5706dfbebac036b884d8973964882519d63febeed48825ab85f927c64162e14eaaf7268161e9c240fa5ef9544a3c3429d8119931640c24eb91d1b92e2b11a3e5 SHA512 5db73cf4d1ccbdb16c619a10bc8b007119c32456ce91a164e15667757d3dc121dd7501f26fefa4eb9ec7394867b94991a54c2cbbf23ade8c6dadac8f3ba4e570
 DIST qjoypad-4.3.1.tar.gz 89122 BLAKE2B 6be6c855ee50f88e4afaa78e7f0d6ce7e529a0866142a59c8a1bf39315329c841b19670aad9ce0556e41b5d599ebb5e3adbc609a623f4908a6c7de2f1bfc64fc SHA512 f6c941c65c06266fb4bcc9e7d8a51c5c3a55f57ba8addfadf9d575f850cad428560c8b51e70faf9a40624088534f7e96d2b7f5747b48d05b25ffd31bad2e645a
-EBUILD qjoypad-4.3.1.ebuild 837 BLAKE2B 2de31f90f3719f58e0ae3280aca7dd90ec31ada9edffae97f1bb7dad9dac8a0610474f355683f29762f8743657ba2fadfd0a146fc0116a2cb030abf0026ca649 SHA512 79551f5f3fcbcfa546f6103848dd9155138b9c721d964b542c9b6c375019c1c57a40648187716c9885cb73eadb7db95dd0aec1bdcd329a1c2d4613c3cb333ef3
+EBUILD qjoypad-4.3.1.ebuild 837 BLAKE2B cb467d5c119099aeb69dfae875167cdb149e584a8a9d31fba527951dd20189a2165c31845d5fbb1fd84b7db9a18ccd62d6c6514e19a9954c541d5ca215b7beba SHA512 67aca2cbd31e26e471245028dab4c00e7b4c401a32a133850f1dc2fa4b9177e4dfb0572506163c6bd26f1fc865615c19d6a559832d9f3cf0295d49b24d3eef67
 MISC metadata.xml 330 BLAKE2B 60b6d79e8bd61ce2911a3ca77273e844d36cad02c50e88d7c0cb67fd30181f237a0c763ae53c79fe29d4f03f4c4e5d7fd2122af6156c3ee28902c2821099faf4 SHA512 007937b334543dcc52d271b9dd594d167b9f003af545c346c81aab34cdfdf5e3f13a7dca30d67044d41d092539e7f9c589e6cd0a6c026b32ac2d7e7b321f2bb3
diff --git a/games-util/qjoypad/qjoypad-4.3.1.ebuild b/games-util/qjoypad/qjoypad-4.3.1.ebuild
index ba8e0cec815f..36b36bdfd204 100644
--- a/games-util/qjoypad/qjoypad-4.3.1.ebuild
+++ b/games-util/qjoypad/qjoypad-4.3.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