[gentoo-commits] repo/gentoo:master commit in: media-gfx/engauge/

[Andreas Sturmlechner]

commit:     12d60733ea2e1e9994c0b75af348dcfcc16157a1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 23 14:55:45 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 15:00:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12d60733

media-gfx/engauge: EAPI-7 bump, gnome2-utils.eclass -> xdg.eclass

Use https, sort deps, call default in src_prepare.

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/engauge/engauge-10.6.ebuild | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/media-gfx/engauge/engauge-10.6.ebuild b/media-gfx/engauge/engauge-10.6.ebuild
index 7f52ab96807..e1145ca2e15 100644
--- a/media-gfx/engauge/engauge-10.6.ebuild
+++ b/media-gfx/engauge/engauge-10.6.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop gnome2-utils qmake-utils
+inherit desktop qmake-utils xdg
 
 DESCRIPTION="Convert an image file showing a graph or map into numbers"
-HOMEPAGE="http://markummitchell.github.io/engauge-digitizer/"
+HOMEPAGE="https://markummitchell.github.io/engauge-digitizer/"
 SRC_URI="https://github.com/markummitchell/engauge-digitizer/archive/v$PV.tar.gz -> engauge-digitizer-$PV.tar.gz"
 
 LICENSE="GPL-2"
@@ -16,23 +16,23 @@ IUSE="doc examples jpeg2k pdf"
 
 RDEPEND="dev-qt/qtcore:5
 	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	dev-qt/qthelp:5
-	dev-qt/qtnetwork:5
 	dev-libs/log4cpp
 	sci-libs/fftw:3.0
 	jpeg2k? ( media-libs/openjpeg:2 )
 	pdf? ( app-text/poppler[qt5] )"
 DEPEND="${RDEPEND}"
 
-S=$WORKDIR/engauge-digitizer-$PV
+S=${WORKDIR}/engauge-digitizer-${PV}
 
-src_prepare() {
-	eapply_user
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
 
-	eapply "${FILESDIR}/${P}-qt-5.11.patch"
+src_prepare() {
+	default
 
 	# Make sure the documentation is looked for in the proper directory
 	sed -e "s:engauge-digitizer/engauge.qhc:${PF}/engauge.qhc:" \
@@ -81,15 +81,3 @@ src_install() {
 		doins -r samples
 	fi
 }
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}