[gentoo-commits] proj/kde-sunset:master commit in: app-text/yagf/

[gentoo-commits] proj/kde-sunset:master commit in: app-text/yagf/

[Andreas Sturmlechner]

commit:     06a4117f50a85c3ba897bf7a6aa8ca44ac0b4d78
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  7 18:06:58 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec  7 18:18:58 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=06a4117f

app-text/yagf: https, EAPI-7, cmake.eclass, sort IUSE/DEPENDs

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

 app-text/yagf/yagf-0.9.5.ebuild | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/app-text/yagf/yagf-0.9.5.ebuild b/app-text/yagf/yagf-0.9.5.ebuild
index 4ab72881..b84c7388 100644
--- a/app-text/yagf/yagf-0.9.5.ebuild
+++ b/app-text/yagf/yagf-0.9.5.ebuild
@@ -1,26 +1,26 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PLOCALES="fr ru"
-inherit cmake-utils l10n multilib
+inherit cmake l10n
 
 DESCRIPTION="Graphical front-end for cuneiform and tesseract OCR tools"
-HOMEPAGE="http://sourceforge.net/projects/yagf-ocr/"
+HOMEPAGE="https://sourceforge.net/projects/yagf-ocr/"
 SRC_URI="mirror://sourceforge/project/yagf-ocr/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="scanner cuneiform +tesseract pdf"
+IUSE="cuneiform pdf scanner +tesseract"
 
 REQUIRED_USE="|| ( cuneiform tesseract )"
 
 DEPEND="
+	app-text/aspell
 	dev-qt/qtcore:4
 	dev-qt/qtgui:4
-	app-text/aspell
 "
 RDEPEND="${DEPEND}
 	cuneiform? ( app-text/cuneiform )
@@ -35,13 +35,12 @@ src_prepare() {
 	# uk translation generation is broken
 	rm src/translations/yagf_uk.ts || die
 	# respect CFLAGS and fix translations path
-	sed -i \
-		-e '/add_definitions(-Wall -g)/d' \
+	sed -e '/add_definitions(-Wall -g)/d' \
 		-e '/-DQML_INSTALL_PATH=/s:${QML_DESTINATION}:/${QML_DESTINATION}:' \
-		CMakeLists.txt || die 'sed on CMakeLists.txt failed'
+		-i CMakeLists.txt || die 'sed on CMakeLists.txt failed'
 
 	l10n_find_plocales_changes "src/translations" "${PN}_" '.ts'
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -49,13 +48,14 @@ src_configure() {
 	local mycmakeargs=(
 		-DLIB_PATH_SUFFIX=${libdir#lib}
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
 	remove_translation() {
-		rm "${ED}/usr/share/yagf/translations/${PN}_${1}.qm" || die "remove '${PN}_${1}.qm' file failed"
+		rm "${ED}/usr/share/yagf/translations/${PN}_${1}.qm" ||
+			die "remove '${PN}_${1}.qm' file failed"
 	}
-	cmake-utils_src_install
+	cmake_src_install
 	l10n_for_each_disabled_locale_do remove_translation
 }