[gentoo-commits] repo/gentoo:master commit in: app-text/nfoview/

["David Seifert" <soap@gentoo.org>]

commit:     d4c26979beb5eb3b50ce32bbf623fb4da457186a
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 16:32:07 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 19:15:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4c26979

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

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-text/nfoview/nfoview-1.15.1.ebuild | 20 +++++++++-----------
 app-text/nfoview/nfoview-9999.ebuild   | 20 +++++++++-----------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/app-text/nfoview/nfoview-1.15.1.ebuild b/app-text/nfoview/nfoview-1.15.1.ebuild
index e96a9fe27f5..eacdccc7a4a 100644
--- 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 58b524bbcff..f8030006af3 100644
--- 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
 }