games-util/pyfa: eapi6-ify

Package-Manager: portage-2.2.27

diff --git a/games-util/pyfa/pyfa-1.19.1.ebuild b/games-util/pyfa/pyfa-1.19.1.ebuild
index bf7db2e88c4d3374d4a81771074d7c13f342b91a..0d2065a0b205e82e1b484cad7473a2d66432367d 100644 (file)
--- a/games-util/pyfa/pyfa-1.19.1.ebuild
+++ b/games-util/pyfa/pyfa-1.19.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI="6"
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite,threads"
 
@@ -39,13 +39,16 @@ src_prepare() {
        edos2unix config.py pyfa.py service/settings.py
 
        # load gameDB and images from separate staticdata directory
-       epatch "${FILESDIR}/${PN}-1.15.1-staticdata.patch"
+       eapply "${FILESDIR}/${PN}-1.15.1-staticdata.patch"
 
        # do not try to save exported html to python sitedir
-       epatch "${FILESDIR}/${PN}-1.1.8-html-export-path.patch"
+       eapply "${FILESDIR}/${PN}-1.1.8-html-export-path.patch"
 
        # fix import path in the main script for systemwide installation
-       epatch "${FILESDIR}/${PN}-1.15.1-import-pyfa.patch"
+       eapply "${FILESDIR}/${PN}-1.15.1-import-pyfa.patch"
+
+       eapply_user
+
        touch __init__.py
 
        pyfa_make_configforced() {

diff --git a/games-util/pyfa/pyfa-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild
index bf7db2e88c4d3374d4a81771074d7c13f342b91a..0d2065a0b205e82e1b484cad7473a2d66432367d 100644 (file)
--- a/games-util/pyfa/pyfa-9999.ebuild
+++ b/games-util/pyfa/pyfa-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI="6"
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite,threads"
 
@@ -39,13 +39,16 @@ src_prepare() {
        edos2unix config.py pyfa.py service/settings.py
 
        # load gameDB and images from separate staticdata directory
-       epatch "${FILESDIR}/${PN}-1.15.1-staticdata.patch"
+       eapply "${FILESDIR}/${PN}-1.15.1-staticdata.patch"
 
        # do not try to save exported html to python sitedir
-       epatch "${FILESDIR}/${PN}-1.1.8-html-export-path.patch"
+       eapply "${FILESDIR}/${PN}-1.1.8-html-export-path.patch"
 
        # fix import path in the main script for systemwide installation
-       epatch "${FILESDIR}/${PN}-1.15.1-import-pyfa.patch"
+       eapply "${FILESDIR}/${PN}-1.15.1-import-pyfa.patch"
+
+       eapply_user
+
        touch __init__.py
 
        pyfa_make_configforced() {