app-text/nfoview: [QA] Port to git-r3

Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/app-text/nfoview/nfoview-1.15.1.ebuild b/app-text/nfoview/nfoview-1.15.1.ebuild
index e96a9fe27f546552dc0f8cadb31e5dec5cef8637..eacdccc7a4a3c3ca47b6978cc8f9320bf6b8f2af 100644 (file)
--- a/app-text/nfoview/nfoview-1.15.1.ebuild
+++ b/app-text/nfoview/nfoview-1.15.1.ebuild
@@ -1,17 +1,15 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 PYTHON_COMPAT=( python3_{4,5,6} )
 
-inherit distutils-r1 fdo-mime gnome2-utils
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="git://github.com/otsaloma/nfoview.git
-               https://github.com/otsaloma/nfoview.git"
-       inherit git-2
-       SRC_URI=""
-       #KEYWORDS=""
+inherit distutils-r1 gnome2-utils xdg-utils
+
+if [[ ${PV} == *9999 ]] ; then
+       EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git"
+       inherit git-r3
 else
        SRC_URI="http://download.gna.org/nfoview/${PV:0:4}/${P}.tar.xz"
        KEYWORDS="amd64 x86"
@@ -24,7 +22,7 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
 
-DEPEND="dev-python/pygobject:3"
+DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
        media-fonts/terminus-font"
 
@@ -34,10 +32,10 @@ pkg_preinst() {
 
 pkg_postinst() {
        gnome2_icon_cache_update
-       fdo-mime_desktop_database_update
+       xdg_desktop_database_update
 }
 
 pkg_postrm() {
        gnome2_icon_cache_update
-       fdo-mime_desktop_database_update
+       xdg_desktop_database_update
 }

diff --git a/app-text/nfoview/nfoview-9999.ebuild b/app-text/nfoview/nfoview-9999.ebuild
index 58b524bbcffbbc236f6de3dec402cd37a79d3902..f8030006af37961ac28bf8785b852d9fcbcee7d9 100644 (file)
--- a/app-text/nfoview/nfoview-9999.ebuild
+++ b/app-text/nfoview/nfoview-9999.ebuild
@@ -1,17 +1,15 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 PYTHON_COMPAT=( python3_{4,5,6} )
 
-inherit distutils-r1 fdo-mime gnome2-utils
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="git://github.com/otsaloma/nfoview.git
-               https://github.com/otsaloma/nfoview.git"
-       inherit git-2
-       SRC_URI=""
-       #KEYWORDS=""
+inherit distutils-r1 gnome2-utils xdg-utils
+
+if [[ ${PV} == *9999 ]] ; then
+       EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git"
+       inherit git-r3
 else
        SRC_URI="http://download.gna.org/nfoview/${PV:0:4}/${P}.tar.xz"
        KEYWORDS="~amd64 ~x86"
@@ -24,7 +22,7 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
 
-DEPEND="dev-python/pygobject:3"
+DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
        media-fonts/terminus-font"
 
@@ -34,10 +32,10 @@ pkg_preinst() {
 
 pkg_postinst() {
        gnome2_icon_cache_update
-       fdo-mime_desktop_database_update
+       xdg_desktop_database_update
 }
 
 pkg_postrm() {
        gnome2_icon_cache_update
-       fdo-mime_desktop_database_update
+       xdg_desktop_database_update
 }