Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

1 files changed, 20 insertions, 16 deletions

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
 }