[gnome-commander] Changes according to comments in the gnome-commander 1.14.0 merge request to gentoo repo

[Uwe Scholz <uwescholz src gnome org>]

commit 67156526c9c265a591d09f9143a2f241ea9ced7d
Author: Uwe Scholz <u scholz83 gmx de>
Date:   Sat Feb 5 23:24:47 2022 +0100

    Changes according to comments in the gnome-commander 1.14.0 merge request to gentoo repo

 data/gnome-commander.ebuild.in | 25 ++++++++-----------------
 data/metadata.xml              |  1 -
 2 files changed, 8 insertions(+), 18 deletions(-)
---
diff --git a/data/gnome-commander.ebuild.in b/data/gnome-commander.ebuild.in
index 02c47dca..038c20bd 100644
--- a/data/gnome-commander.ebuild.in
+++ b/data/gnome-commander.ebuild.in
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 GNOME2_LA_PUNT="yes"
 
@@ -13,44 +13,35 @@ HOMEPAGE="https://gcmd.github.io/";
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="chm exif gsf pdf samba taglib test +unique"
+IUSE="exif gsf pdf samba taglib test +unique"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
        app-text/yelp-tools
-       dev-libs/atk
-       dev-libs/glib:2
-       gnome-base/gconf:2
-       gnome-base/gnome-vfs
-       media-libs/fontconfig
-       media-libs/freetype
-       media-libs/harfbuzz:=
-       x11-libs/cairo
-       x11-libs/gdk-pixbuf:2
-       x11-libs/gtk+:2
-       x11-libs/pango
-       chm? ( dev-libs/chmlib )
+       >=dev-libs/glib-2.70.0:2
+       >=x11-libs/gtk+-@GTK_REQ@:2
        exif? ( >=media-gfx/exiv2-@EXIV2_REQ@ )
-       gsf? ( gnome-extra/libgsf:= )
+       gsf? ( >=gnome-extra/libgsf-1.12:= )
        pdf? ( >=app-text/poppler-@POPPLER_REQ@ )
        samba? ( gnome-base/gvfs[samba] )
        taglib? ( >=media-libs/taglib-@TAGLIB_REQ@ )
        unique? ( >=dev-libs/libunique-@UNIQUE_REQ@:1 )
 "
 BDEPEND="
-       ${RDEPEND}
+       app-text/yelp-tools
        dev-util/gtk-doc-am
        sys-devel/gettext
        virtual/pkgconfig
 "
 DEPEND="
+       ${RDEPEND}
        test? ( >=dev-cpp/gtest-@GTEST_REQ@ )
 "
 
 src_configure() {
        gnome2_src_configure \
                --disable-static \
-               $(use_with chm libchm) \
+               --without-libchm \
                $(use_with exif exiv2) \
                $(use_with gsf libgsf) \
                $(use_with pdf poppler) \
diff --git a/data/metadata.xml b/data/metadata.xml
index 3085b7e9..a064c422 100644
--- a/data/metadata.xml
+++ b/data/metadata.xml
@@ -16,7 +16,6 @@
   <remote-id type="freecode">gnome-commander</remote-id>
 </upstream>
 <use>
-  <flag name="chm">Enable metadata support for Microsoft Compiled HTML Help files</flag>
   <flag name="gsf">Add metadata support for OLE, OLE2 and ODF</flag>
   <flag name="pdf">Add metadata support for PDF</flag>
   <flag name="samba">Add support for SAMBA (Windows File and Printer sharing)</flag>