gentoo resync : 17.02.2021

5 files changed, 29 insertions, 31 deletions

diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index 365958357810..323940a042fc 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/heimdall/Manifest b/app-mobilephone/heimdall/Manifest
index 59bcb790cb5e..0f02d6f858fa 100644
--- a/app-mobilephone/heimdall/Manifest
+++ b/app-mobilephone/heimdall/Manifest
@@ -1,4 +1,4 @@
 DIST heimdall-1.4.2.tar.bz2 5506713 BLAKE2B 775abc8d47f9efac21f28e47d607ab4b07f8948fcca005c78ddb7ed093e51a76f60ac5c04150a3424c360813d180cd1df1ff8a87295918bff872f41123250a58 SHA512 b2b0a8a8db6a52236716fff9748a391388c1b2b1774a26fab9b451b8dab5ff35e8e1403555a65daec180fc961388c7581d170df6e3599a102fd304a133da8674
-EBUILD heimdall-1.4.2.ebuild 1099 BLAKE2B e48bfefd24962e9e872a61bd7eacc2f5d892e4bf493a3f8629aea7ee878e534aef2701ac8a311a2090b79431af46f4634c9cada4f066fbbcb5c776739d8ea9d8 SHA512 13eb8d537049e12ed34c6631e6111d61cef3a352c22baa9bf2a1772a23acd20af54497ab450ae6162ec0d90711a37ac0304d3a56f4613d65632e3f6a666ddee9
-EBUILD heimdall-9999.ebuild 1100 BLAKE2B d7b6a6e510f4d6b7c66f5f4762f2d22c7f6a22e7cc943b74baa10d9d54bf5f5a49bf6f4782294a52127cf78fe3a3133796a4792c1dfae425638e1d3d6261c46c SHA512 c2317d233116119123b5f00dedceabba22809059e35312c717676e219a86400e1e8e3a4a2b29db28f32ba2151d4f2bfb7a930a64fa744c6f7ec14b912b03b76d
-MISC metadata.xml 260 BLAKE2B 4676060518065fc71e2cc4d78296c937e6ec46bf141677b91cb206471efe2f47b23a4ef4c5f7ca5ad9909ce94447d3383da263a312943e735ac5d8a21b0f2d97 SHA512 f612b13f44d5a24c9380bd1933982afd36739093536338346c079032f9a9cfce99aaaed26f58bbc48bbf987bc47fa99e90147c1f292917138d41a994e564022a
+EBUILD heimdall-1.4.2.ebuild 1055 BLAKE2B 6579d47c8e74492fbe3da7489fd6ebfb062cc5fd167fa8d7678447c0c2c62bdab0fc215362162b7aa09dac9b490eebbb963155f61a49afc8f2c09f210df55f1e SHA512 df06bdf6e550cdfbb4dfc025037002286cf8e0b677c7bfec4a68a2ec7257640e033be6c1c2a1f62f7122df487ff86ddb93058ac310535cca302dc99e13f667f2
+EBUILD heimdall-9999.ebuild 1056 BLAKE2B d03ca39689d7807d9478e14761d4fd4e18c71720038706d81c162a12ad95deb48b3647564f66052f5fad5d5f1a54d45571c58c85fca106b780014dfea374feab SHA512 0a824daa2b387832764b2243652c6efadc40724fbeb2893290eb87575bd73cfe4e9a96c5abb70980e62eb2ab0a53b0e968c6275fed251ec2ac8040f79aed52df
+MISC metadata.xml 255 BLAKE2B 78e757fc09b4330ab3b0b18ca84e305285598818ae326f66a1cc80cfd1de83af4abfb4174fc6b8ad0ff385f730b1cb6208b99a0ecef91aad5837196937ad31ca SHA512 7ad2bd23ece0c6c258d52c460d6f33570eece2ebda7f3526556e2428afc85936284bb1fdbd82b38cea5654b12f5530e026bc5f0cd5b8a3a83a3c9750eb6ea91a
diff --git a/app-mobilephone/heimdall/heimdall-1.4.2.ebuild b/app-mobilephone/heimdall/heimdall-1.4.2.ebuild
index d9c1a516de6c..ec8238d43d9b 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 15242ac0f035..e583714cae2f 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 8fe7397a60ba..cbbc2b0edd97 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>