[gentoo-commits] repo/gentoo:master commit in: app-mobilephone/heimdall/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     86b4fa118b04576c7770ecf02fcdf1e0b6ee02fa
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 18:52:34 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 19:04:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86b4fa11

app-mobilephone/heimdall: EAPI-7, cmake.eclass, IUSE=qt5->gui

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

 app-mobilephone/heimdall/heimdall-1.4.2.ebuild | 23 +++++++++++------------
 app-mobilephone/heimdall/heimdall-9999.ebuild  | 23 +++++++++++------------
 app-mobilephone/heimdall/metadata.xml          |  8 ++++----
 3 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/app-mobilephone/heimdall/heimdall-1.4.2.ebuild b/app-mobilephone/heimdall/heimdall-1.4.2.ebuild
index d9c1a516de6..ec8238d43d9 100644
--- a/app-mobilephone/heimdall/heimdall-1.4.2.ebuild
+++ b/app-mobilephone/heimdall/heimdall-1.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils udev
+inherit cmake udev
 
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://gitlab.com/BenjaminDobell/Heimdall/-/archive/v${PV}/Heimdall-v${PV}.tar.bz2 -> ${P}.tar.bz2"
@@ -19,31 +19,30 @@ HOMEPAGE="https://glassechidna.com.au/heimdall/"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="qt5"
+IUSE="gui"
 
-# virtual/libusb is not precise enough
 RDEPEND="
 	>=dev-libs/libusb-1.0.18:1=
-	qt5? (
+	sys-libs/zlib
+	gui? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
 	)
-	sys-libs/zlib
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	local mycmakeargs=(
-		-DDISABLE_FRONTEND="$(usex !qt5)"
+		-DDISABLE_FRONTEND=$(usex !gui)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
 	dobin "${BUILD_DIR}"/bin/heimdall
-	use qt5 && dobin "${BUILD_DIR}"/bin/heimdall-frontend
+	use gui && dobin "${BUILD_DIR}"/bin/heimdall-frontend
 
 	insinto "$(get_udevdir)/rules.d"
 	doins heimdall/60-heimdall.rules

diff --git a/app-mobilephone/heimdall/heimdall-9999.ebuild b/app-mobilephone/heimdall/heimdall-9999.ebuild
index 15242ac0f03..e583714cae2 100644
--- a/app-mobilephone/heimdall/heimdall-9999.ebuild
+++ b/app-mobilephone/heimdall/heimdall-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils udev
+inherit cmake udev
 
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://gitlab.com/BenjaminDobell/Heimdall/-/archive/v${PV}/Heimdall-v${PV}.tar.bz2 -> ${P}.tar.bz2"
@@ -19,31 +19,30 @@ HOMEPAGE="https://glassechidna.com.au/heimdall/"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="qt5"
+IUSE="gui"
 
-# virtual/libusb is not precise enough
 RDEPEND="
 	>=dev-libs/libusb-1.0.18:1=
-	qt5? (
+	sys-libs/zlib
+	gui? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
 	)
-	sys-libs/zlib
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	local mycmakeargs=(
-		-DDISABLE_FRONTEND="$(usex !qt5)"
+		-DDISABLE_FRONTEND=$(usex !gui)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
 	dobin "${BUILD_DIR}"/bin/heimdall
-	use qt5 && dobin "${BUILD_DIR}"/bin/heimdall-frontend
+	use gui && dobin "${BUILD_DIR}"/bin/heimdall-frontend
 
 	insinto "$(get_udevdir)/rules.d"
 	doins heimdall/60-heimdall.rules

diff --git a/app-mobilephone/heimdall/metadata.xml b/app-mobilephone/heimdall/metadata.xml
index 8fe7397a60b..cbbc2b0edd9 100644
--- a/app-mobilephone/heimdall/metadata.xml
+++ b/app-mobilephone/heimdall/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="gitlab">BenjaminDobell/Heimdall</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="gitlab">BenjaminDobell/Heimdall</remote-id>
+	</upstream>
 </pkgmetadata>