gentoo resync : 05.02.2020

17 files changed, 58 insertions, 619 deletions

diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 91344fa550eb..c1dfa6cca67e 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/nml/Manifest b/games-util/nml/Manifest
index cda0cb06967c..95cf881bd23f 100644
--- a/games-util/nml/Manifest
+++ b/games-util/nml/Manifest
@@ -2,7 +2,5 @@ AUX nml-0.4.4-pillow3.patch 288 BLAKE2B 5d1446821d75432002a36439c6e39fa7f644f9a6
 AUX nml-0.4.5-pillow6.patch 981 BLAKE2B 56e1f6ed41a6978a021db50880092fed7199d104cd006962a54fb09bcba365a320cac878041b4fe6ee6a6801a2c7e666154105a4dd2b349f030b62da9669d1fe SHA512 de304562bb2ef90b9068a1975a3cb5fd83a9b5e473371f87620fe5a02866b805adba37b46c8c1b40a7a6d304d5c8339ee78ee4a87d683c540126e5fc3ea49303
 AUX nml-0.4.5-pillow7.patch 1381 BLAKE2B 8099d451f7bf93fb5b996335852103751b024a47b5b24c054cf77708d6deea6002a053bf92aa245d63ea52bca710620598e6d6544739c0c01d64bf9c0f7938dd SHA512 7dd7a60391a4e316273243468c18d30b7b674c241e3c0fb2a24c3559b0dfbc7a2f3d67baf8b5cda9ec419a7dc1f2a1c0942cdd9d1beedebaeafef76111c4fd19
 DIST nml-0.4.5.tar.gz 378578 BLAKE2B 1283cdcabd4cbaf12dda926b89c88a3942e9e4469879812abe372facd2c41ff20af0df792bbdadf71d9d3ad8d72e98e293fd903c880e77d3e4ee8a1b73e36ca9 SHA512 64b2f46a1c2e37fce8f51231094e30334f368b0db39c6a3977a144a798d8034d1abbe7c14af3921eb81f4b7caa193e7e53ccb9e27acd113e0407926b109ca952
-EBUILD nml-0.4.5-r1.ebuild 743 BLAKE2B 86201ab24cf3ea84ecca66daf178674896870804167b605239164febb7d520fc028fa0554ea34de89ac6e72f0ea21c1734d609cc87217556b1327356dadef8b1 SHA512 300d9c672851b9fb35bdab80ddf04373eb7ab2d71af963712c65c16f39320101cc72501f914f65d670ff6d0fc12f9e2838569675b969d1e6815eb259c8ea757c
 EBUILD nml-0.4.5-r2.ebuild 798 BLAKE2B cd95acb191dba0e912fccfb6b6a9847c1c9c80c3e071fdb3654b4593ff486429861fff51765aca9d7784b56f828d9af567ca6940934cebbf0e61277f5b406461 SHA512 f53d919219266fa156cfa0f58ae278115cefa231c1aa83cd8b94ee1d60d5946671c6c61f305bebcb109a68f9be1bddb60a77d555c0d877e6b9cfe6c4c2e9c4d8
-EBUILD nml-0.4.5.ebuild 708 BLAKE2B 9920a8690e33ac2ea04a96095873138a4c222da9299998fc81323ea928ea87890ff3577b968a4e5981cf76af17ae65a1473763ad87634fb076800f75de65a779 SHA512 aef814f3b17d06efeb3438192ff03427ee1d14ea5312b3211d78017644c08a433bed003f13d943f09f16715194ed3cac47ae17ec29d43a813aacdf6143c9bac1
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/nml/nml-0.4.5-r1.ebuild b/games-util/nml/nml-0.4.5-r1.ebuild
deleted file mode 100644
index 8b53673e33f2..000000000000
--- a/games-util/nml/nml-0.4.5-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Compiler of NML files into grf/nfo files"
-HOMEPAGE="https://dev.openttdcoop.org/projects/nml"
-SRC_URI="http://bundles.openttdcoop.org/nml/releases/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="dev-python/pillow[zlib,${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( docs/{changelog,readme}.txt )
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.4-pillow3.patch
-	"${FILESDIR}"/${PN}-0.4.5-pillow6.patch
-)
-
-src_install() {
-	distutils-r1_src_install
-	doman docs/nmlc.1
-}
diff --git a/games-util/nml/nml-0.4.5.ebuild b/games-util/nml/nml-0.4.5.ebuild
deleted file mode 100644
index 66998758e626..000000000000
--- a/games-util/nml/nml-0.4.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Compiler of NML files into grf/nfo files"
-HOMEPAGE="https://dev.openttdcoop.org/projects/nml"
-SRC_URI="http://bundles.openttdcoop.org/nml/releases/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="<dev-python/pillow-6.0.0[zlib,${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( docs/{changelog,readme}.txt )
-PATCHES=( "${FILESDIR}"/${PN}-0.4.4-pillow3.patch )
-
-src_install() {
-	distutils-r1_src_install
-	doman docs/nmlc.1
-}
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index fc0fcce16c34..3290166f0762 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -1,18 +1,8 @@
 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
 DIST pyfa-2.15.1.tar.gz 14516568 BLAKE2B ba3b1170f35681ab33bece447b4bdf563c8f964037dc6b35cbd23360f7e36c61dd9074e34b5648c7a04b59ad192f5babd75ce2a935940a52e62de8cc174f7e5b SHA512 2d8fcb8608e31c135b8dac7239afe0a5acb0d32fba1291ce6ebafe093ef232c08f0aa42d172ebac5beefb7dba47aad9eb3833c679e3d02edc9cc056739c7538b
-EBUILD pyfa-1.34.0.ebuild 2727 BLAKE2B 854eea8248bcabaf285147ea2bff9a145c77669af83831e5f6dd868322c39dbd85499720475c56d4ec112bf422df67e6f36af0653e6fe47f31821b5b3f3b45f1 SHA512 96433c264f4fed3142e95588fd857d633ad5b8af45aa5c3ddbc209fdec557b9c91136f988e46156ba8e9e0b9ccb1f452a532d56dce4d3dd46227bfde16c4d2bb
-EBUILD pyfa-1.35.0.ebuild 2723 BLAKE2B 44f075f5f64e66b64d1321bc2f2c8c8c9449d3aef4d341eee193aa143e67d63cf63cf4921f36b62e5b2514a02f4ea6d28dbc5107a1a8badac060db6f5bb7ca18 SHA512 3bf1f7c0a706832f78c06e6f2547240e23e2ad38a3aa67ee40f4fa70cc17a191b09e3cf3b5d7eac142ffc0f231d3fdec7ed36c6c5842f681b7c99b49fed8d07f
-EBUILD pyfa-1.35.1.ebuild 2723 BLAKE2B 44f075f5f64e66b64d1321bc2f2c8c8c9449d3aef4d341eee193aa143e67d63cf63cf4921f36b62e5b2514a02f4ea6d28dbc5107a1a8badac060db6f5bb7ca18 SHA512 3bf1f7c0a706832f78c06e6f2547240e23e2ad38a3aa67ee40f4fa70cc17a191b09e3cf3b5d7eac142ffc0f231d3fdec7ed36c6c5842f681b7c99b49fed8d07f
-EBUILD pyfa-1.37.0.ebuild 2620 BLAKE2B 12c41fc600479dc183b8aa4475189d88490ac31c5f83c7fb1e513697608431fc6a669440b73050b4b1df9c971c7d1ba62580f0ffab9c87fa8c933174a59bec06 SHA512 8fd1ffa6c88ae81d524de60c156ef13bec4103b6965ff5034ef639b3be8463f1ecca23ca223427a489146fde5a3df924bfa6c298a478ef8818a941e27e219da2
 EBUILD pyfa-2.14.1.ebuild 2657 BLAKE2B a5df3021d46db87e386fd609bbc31de973d724995a8aa0493ed8960670a6b3e92704d9a5a7b1691cf95228d062bdd6638385fb2295c3b8e224a95574c1356599 SHA512 74a1637f9c86bacda4713e1ed1cced990f05a6d7aa0d34d62ee153ce197490d6f73c936a551ca68bc19ce4fe9b25fd32e4f7cc3239deaa734179190e96f707b2
 EBUILD pyfa-2.15.1.ebuild 2637 BLAKE2B 15f7df9668597799c55c7d11d4537e0e2a46cceae8e75fc0a4db84148f3119c277a72e13437ffb6cffde95aa6fb3568de40339e54826e4b1650ba891fb76f0ee SHA512 d2c37266541e982b2398797b4e09b1864c4ec3abfc1756e56a90eab6a9c6e3ce841d7fb6da2373f67e8b4d354f4c79b723a60062fcd9ac83c9077df65d567d9a
 EBUILD pyfa-9999.ebuild 2637 BLAKE2B 15f7df9668597799c55c7d11d4537e0e2a46cceae8e75fc0a4db84148f3119c277a72e13437ffb6cffde95aa6fb3568de40339e54826e4b1650ba891fb76f0ee SHA512 d2c37266541e982b2398797b4e09b1864c4ec3abfc1756e56a90eab6a9c6e3ce841d7fb6da2373f67e8b4d354f4c79b723a60062fcd9ac83c9077df65d567d9a
diff --git a/games-util/pyfa/files/pyfa-1.33.1-import-pyfa.patch b/games-util/pyfa/files/pyfa-1.33.1-import-pyfa.patch
deleted file mode 100644
index 0c71ce69f720..000000000000
--- a/games-util/pyfa/files/pyfa-1.33.1-import-pyfa.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c35467378232b1b21cca304f5dba37c687e51bca Mon Sep 17 00:00:00 2001
-From: Andreas Zuber <zuber@puzzle.ch>
-Date: Mon, 30 Oct 2017 09:52:32 +0100
-Subject: [PATCH 2/3] 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 4faa1edd..9cfa5e23 100755
---- a/pyfa.py
-+++ b/pyfa.py
-@@ -23,6 +23,7 @@ import os
- import platform
- import re
- import sys
-+sys.path.append(os.path.join("%%SITEDIR%%", "pyfa"))
- import traceback
- from optparse import AmbiguousOptionError, BadOptionError, OptionParser
- 
--- 
-2.14.3
-
diff --git a/games-util/pyfa/files/pyfa-1.33.1-staticdata.patch b/games-util/pyfa/files/pyfa-1.33.1-staticdata.patch
deleted file mode 100644
index 76a705e2c832..000000000000
--- a/games-util/pyfa/files/pyfa-1.33.1-staticdata.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 54f0cd42c6f022e010c63ba7b1f123f78001b490 Mon Sep 17 00:00:00 2001
-From: Andreas Zuber <zuber@puzzle.ch>
-Date: Mon, 30 Oct 2017 09:53:31 +0100
-Subject: [PATCH 3/3] staticdata
-
-make gameDB and imgs.zip paths settable from configforced
----
- config.py           | 7 +++++++
- gui/bitmapLoader.py | 2 +-
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/config.py b/config.py
-index b15c30a3..a5a07acb 100644
---- a/config.py
-+++ b/config.py
-@@ -30,6 +30,7 @@ savePath = None
- saveDB = None
- gameDB = None
- logPath = None
-+imgsZIP = None
- 
- 
- def isFrozen():
-@@ -61,6 +62,7 @@ def defPaths(customSavePath):
-     global savePath
-     global saveDB
-     global gameDB
-+    global imgsZIP
-     global saveInRoot
- 
-     pyfalog.debug("Configuring Pyfa")
-@@ -100,6 +102,11 @@ def defPaths(customSavePath):
-     if not gameDB:
-         gameDB = os.path.join(pyfaPath, "eve.db")
- 
-+    imgsZIP = getattr(configforced, "imgsZIP", imgsZIP)
-+    if not imgsZIP:
-+        imgsZIP = os.path.join(pyfaPath, "imgs.zip")
-+
-+
-     # DON'T MODIFY ANYTHING BELOW
-     import eos.config
- 
-diff --git a/gui/bitmapLoader.py b/gui/bitmapLoader.py
-index eb53b1f1..86036001 100644
---- a/gui/bitmapLoader.py
-+++ b/gui/bitmapLoader.py
-@@ -37,7 +37,7 @@ except ImportError:
- 
- class BitmapLoader(object):
-     try:
--        archive = zipfile.ZipFile(os.path.join(config.pyfaPath, 'imgs.zip'), 'r')
-+        archive = zipfile.ZipFile(config.imgsZIP, 'r')
-         logging.info("Using zipped image files.")
-     except IOError:
-         logging.info("Using local image files.")
--- 
-2.14.3
-
diff --git a/games-util/pyfa/pyfa-1.34.0.ebuild b/games-util/pyfa/pyfa-1.34.0.ebuild
deleted file mode 100644
index d95e2cc04932..000000000000
--- a/games-util/pyfa/pyfa-1.34.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,threads"
-
-inherit eutils gnome2-utils python-r1
-
-DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="https://github.com/pyfa-org/Pyfa"
-
-LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 all-rights-reserved"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
-	inherit git-r3
-	KEYWORDS="amd64 x86"
-else
-	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}"
-RESTRICT="mirror bindist"
-
-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}] )
-	${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
-
-	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"
-		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-			pyfa.py > "${BUILD_DIR}/pyfa"
-	}
-	python_foreach_impl pyfa_make_configforced
-}
-
-src_install() {
-	pyfa_py_install() {
-		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
-
-	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_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-util/pyfa/pyfa-1.35.0.ebuild b/games-util/pyfa/pyfa-1.35.0.ebuild
deleted file mode 100644
index c0429060cc70..000000000000
--- a/games-util/pyfa/pyfa-1.35.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,threads"
-
-inherit eutils gnome2-utils python-r1
-
-DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="https://github.com/pyfa-org/Pyfa"
-
-LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 all-rights-reserved"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
-	inherit git-r3
-	KEYWORDS="x86"
-else
-	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}"
-RESTRICT="mirror bindist"
-
-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}] )
-	${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
-
-	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"
-		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-			pyfa.py > "${BUILD_DIR}/pyfa"
-	}
-	python_foreach_impl pyfa_make_configforced
-}
-
-src_install() {
-	pyfa_py_install() {
-		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
-
-	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_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-util/pyfa/pyfa-1.35.1.ebuild b/games-util/pyfa/pyfa-1.35.1.ebuild
deleted file mode 100644
index c0429060cc70..000000000000
--- a/games-util/pyfa/pyfa-1.35.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,threads"
-
-inherit eutils gnome2-utils python-r1
-
-DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="https://github.com/pyfa-org/Pyfa"
-
-LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 all-rights-reserved"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
-	inherit git-r3
-	KEYWORDS="x86"
-else
-	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}"
-RESTRICT="mirror bindist"
-
-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}] )
-	${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
-
-	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"
-		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-			pyfa.py > "${BUILD_DIR}/pyfa"
-	}
-	python_foreach_impl pyfa_make_configforced
-}
-
-src_install() {
-	pyfa_py_install() {
-		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
-
-	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_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
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 a366235de533..000000000000
--- a/games-util/pyfa/pyfa-1.37.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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"
-
-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}"
-RESTRICT="mirror bindist"
-
-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/qstat/Manifest b/games-util/qstat/Manifest
index a4dfc2ac60f9..f1f8292c7e54 100644
--- a/games-util/qstat/Manifest
+++ b/games-util/qstat/Manifest
@@ -1,5 +1,6 @@
+AUX qstat-2.14-gcc-10.patch 1546 BLAKE2B 4510244b1bd6cbaa0488b13c413d6ed2e58f0cb189cea23e4777415fd4d7b9b67b300eee30c14e39f0ef8c594117eab23962232de65683b37bcc5bc88f707fb1 SHA512 445c7fa7ba892ece7a6ae55c3fadb4a5691ad9e37bdca40541efece6cd053651a4bd6089aadaa0661c5d97db76530d2b04def3df6ca9bf11af3eb37de3c410e6
 DIST qstat-2.11.tar.gz 258335 BLAKE2B f12d0f69c8a73f9eeb273c46aefe2008b8c724b132e02d2fa156c2456f537d2162ae7db6acd0007c7db8bc87dafcfb41355466008c74ce3e912023a7c8cb42cc SHA512 e3ff732c6fc45300eb2f32b3f3e8e1e5f8ee32234535e8d2ca19cf95cf6d4a6de5b6f1e48a5c64315d60a8b388521106b2de9d307f718f6150ad2cf40ba75a22
 DIST qstat-2.14.tar.gz 210440 BLAKE2B 2a33287a69fe63c59a1cb136e84ea29cccd27f4468cb4b38b4e9ce49f28a558dc67793eaa7ead7addd828730e084a15f9684ccba7753852ce1c2795c7c94cb78 SHA512 f2054d74399fe1773a19ca43629e10364fdd87e551459719685c11f38245a05906631b456848b1a3764b4e6843baf654af6a9b174c7b16908b6bcb97ac64c6d6
 EBUILD qstat-2.11.ebuild 677 BLAKE2B d5997ad9bf5dcb6e9e5d689080f2056c310b8924e636e4e1b61d8c7a5362c4dd46301e34ffd11500e01753692af86e897facc2185ad9713ee0fcd7605ea33b03 SHA512 14bd978d242400b4929997011f8c4bb55171504f132400d71d2b4723569385779f0b6d6017675b67a90ffe8418d80ba0a4605c7a71de5b4a3325bc66cc601b95
-EBUILD qstat-2.14.ebuild 775 BLAKE2B d410af9edf50b7a31d5be7d1306db8e9fab011a3cba172b849f842822ed944feda75691335281a038b49b88d8884636d7c092d543993291c6569474b11696dcb SHA512 5b82f8c8182b1c01f9e46fb83fc7ad87a22b34d8c1cb18cea2f8c010202fcec274d9742ecb97eae7b82800eb5ae91fff299c38303854e067c1869ae20fa65a62
+EBUILD qstat-2.14.ebuild 818 BLAKE2B c19fe95427c004be3c1357f01b89b95d89fd4b7cc8d4c2736381a43cd29b6b64ea86ea351d5f23dd859186627029812244e9c7461c57e7358f6567692be9acb8 SHA512 0016b864ba3c90ae6b92681e70f0f5991d030b33e0fb4d4da11abf68907f5c55b29b503e2176435ddddb61de462c37a5ff24cbdb8d882a2d1391715388421257
 MISC metadata.xml 328 BLAKE2B 05e29df4e66acb89893251aec455d3f05f38344bd12414e74ac46d23573afcd8c7e4d7b2e03d217c443a32e31beaea3d122cd474e317e3490c1d6bbdb7de4c4d SHA512 1f3cbc63b69d59880ff6fe131bf838f69bfd259a93882ef9b38c1d101d4048c2894cf99725d3ce683f9f05da035567d6e4bdafa9d4349844f7b8af98c13f999f
diff --git a/games-util/qstat/files/qstat-2.14-gcc-10.patch b/games-util/qstat/files/qstat-2.14-gcc-10.patch
new file mode 100644
index 000000000000..e16e701330a0
--- /dev/null
+++ b/games-util/qstat/files/qstat-2.14-gcc-10.patch
@@ -0,0 +1,51 @@
+From 878fa5fd6475685c3465a6e71a10c2fc61c1a09c Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sun, 26 Jan 2020 11:15:10 +0000
+Subject: [PATCH] qstat: fix build failure against gcc-10
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On gcc-10 (and gcc-9 -fno-common) build fails as:
+
+```
+gcc ... -o qstat ...
+ld: config.o:qstat/display_json.h:24:
+  multiple definition of `json_printed'; xform.o:qstat/display_json.h:24: first defined here
+ld: config.o:qstat/display_json.h:23:
+  multiple definition of `json_encoding'; xform.o:qstat/display_json.h:23: first defined here
+```
+
+gcc-10 will change the default from -fcommon to fno-common:
+https://gcc.gnu.org/PR85678.
+
+The error also happens if CFLAGS=-fno-common passed explicitly.
+
+Reported-by: Toralf Förster
+Bug: https://bugs.gentoo.org/706390
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ debug.c        | 2 +-
+ debug.h        | 2 +-
+
+--- a/debug.c
++++ b/debug.c
+@@ -114,6 +114,7 @@ static void _dump_packet(const char* tag, const char* buf, int buflen)
+ 	close(fd);
+ }
+ 
++int do_dump = 0;
+ ssize_t send_dump(int s, const void *buf, size_t len, int flags)
+ {
+ 	if(do_dump)
+--- a/debug.h
++++ b/debug.h
+@@ -47,7 +47,7 @@ void dump_packet(const char* buf, int buflen);
+ #endif
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-int do_dump;
++extern int do_dump;
+ ssize_t send_dump(int s, const void *buf, size_t len, int flags);
+ #ifndef QSTAT_DEBUG_C
+ #define send(s, buf, len, flags) send_dump(s, buf, len, flags)
diff --git a/games-util/qstat/qstat-2.14.ebuild b/games-util/qstat/qstat-2.14.ebuild
index 3dbdb38a119f..ee781cb84953 100644
--- a/games-util/qstat/qstat-2.14.ebuild
+++ b/games-util/qstat/qstat-2.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,6 +18,10 @@ DEPEND="!sys-cluster/torque"
 
 DOCS=( CHANGES.txt COMPILE.txt template/README.txt )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-10.patch
+)
+
 src_prepare() {
 	default
 	eautoreconf
diff --git a/games-util/xboxgw/Manifest b/games-util/xboxgw/Manifest
deleted file mode 100644
index 4ab83a1e0ee4..000000000000
--- a/games-util/xboxgw/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST hmlibs-1.07-2.i386.tgz 120364 BLAKE2B 3c2ffa9968ac3c39962314b41f19dc3071a0921f68f35ac1b20908fb496398e4957b7112f81a9658fb4ebb69f637039dfce0a180039ee787df850cfb9153eb04 SHA512 2624c44bee7985586288f3c3e2c27e30fb23735a555635ec5a2813a40a54eb7ae1ec0e6f691d883832ec2790ad88a7f03e15ebbaea464db20e2107635463c96c
-DIST xboxgw-1.08-2.tgz 91488 BLAKE2B 104f057e5f29d03525ad2460fa427cb32adadd8ee54d49c82e8ed61c976728494076cdc1b0fffb5f766f9f67a5045aecf2ce0022f2c68af10d8eb06573732693 SHA512 dd4b97fd535e84b4cae34135ab8220399e410a0ca3c73e3fff244ba6ec7f6944f40a7e33c74f3872496cae03fb87dc90e11b7fd4b788ee061d32f86ad36b0617
-EBUILD xboxgw-1.082.ebuild 971 BLAKE2B f70efb4fb3267d0e9d1ad7becb165de56d5ecbb62921443d748f7baff5edea21810b19c4cf740da72adc7247eaa961cb4893985eadfca1adc93b0f042dbb7bf5 SHA512 20509489a6e785937273a24bc026c7a1482edfb5240bf6ed0a0062a0fa31dd328dca771731f667b5625cf92fee32b23f35539b1fad90b09cd246fdf441c1893a
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/xboxgw/metadata.xml b/games-util/xboxgw/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-util/xboxgw/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-util/xboxgw/xboxgw-1.082.ebuild b/games-util/xboxgw/xboxgw-1.082.ebuild
deleted file mode 100644
index ef0a637ca80a..000000000000
--- a/games-util/xboxgw/xboxgw-1.082.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-XBOXGW_P="${PN}-1.08-2"
-HMLIBS_P="hmlibs-1.07-2"
-
-DESCRIPTION="Tunnels XBox system link games over the net"
-HOMEPAGE="http://www.xboxgw.com/"
-SRC_URI="http://www.xboxgw.com/rel/dist2.1/tarballs/i386/${XBOXGW_P}.tgz
-	http://www.xboxgw.com/rel/dist2.1/tarballs/i386/${HMLIBS_P}.i386.tgz"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-QA_PREBUILT="opt/${PN}/lib/libhmdb.so
-	opt/${PN}/lib/libhmsched.so
-	opt/${PN}/lib/libhmcli.so
-	opt/${PN}/lib/libhmsdb.so
-	opt/${PN}/bin/hmdbdump
-	opt/${PN}/bin/xboxgw
-	opt/${PN}/bin/xbifsetup"
-
-S=${WORKDIR}
-
-src_install() {
-	into /opt/${PN}
-
-	cd "${WORKDIR}/${HMLIBS_P}"
-	dolib.so *.so
-	dobin hmdbdump
-	insinto /usr/include/hmlibs
-	doins *.h
-
-	cd "${WORKDIR}/${XBOXGW_P}"
-	dobin xboxgw xbifsetup
-	dodoc *.txt
-
-	if use amd64 ; then
-		mv "${D}"/opt/${PN}/lib64 "${D}"/opt/${PN}/lib || die
-	fi
-}